Skip to content

Commit 7c70c08

Browse files
authoredAug 6, 2024··
Upgrade to Rails 7.1 (#585)
* Update Ruby version in DockerfileBase to 3.3 * button_to changes * Load new defaults * Update deps * Fixes * Log background daemon also to stdout for convenience * Occasionally print the names of running background tasks * Fixes * Import fixes * Small fixes * Update bundler version * Dockerfile update * Update Ruby version to 3.0 in GitHub actions * Fix factories * Test fixes * Belongs to changes * Fix rest of model specs * Fix controller specs * WIP usermanual tests * Rubocop * Install chromium in Dockerfile * Revert "WIP usermanual tests" This reverts commit abd9f90. * Test fixes * Update Docker compose commands in CI workflow * Stop running spec/usermanual
1 parent 4399c1e commit 7c70c08

File tree

74 files changed

+688
-536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+688
-536
lines changed
 

‎.github/workflows/ci.yml

+18-42
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ jobs:
1818
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
1919
git submodule update --init --recursive
2020
- name: Docker compose build
21-
run: docker-compose build
21+
run: docker compose build
2222
- name: Setup database & test env
23-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
23+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
2424
- name: Run spec_v8 tests
25-
run: docker-compose run web bin/spec_v8
25+
run: docker compose run web bin/spec_v8
2626

2727
spec_models:
2828
runs-on: ubuntu-latest
@@ -36,11 +36,11 @@ jobs:
3636
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
3737
git submodule update --init --recursive
3838
- name: Docker compose build
39-
run: docker-compose build
39+
run: docker compose build
4040
- name: Setup database & test env
41-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
41+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
4242
- name: Run spec_models tests
43-
run: docker-compose run web bin/spec_models
43+
run: docker compose run web bin/spec_models
4444

4545
spec_controllers:
4646
runs-on: ubuntu-latest
@@ -54,11 +54,11 @@ jobs:
5454
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
5555
git submodule update --init --recursive
5656
- name: Docker compose build
57-
run: docker-compose build
57+
run: docker compose build
5858
- name: Setup database & test env
59-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
59+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
6060
- name: Run spec_controllers tests
61-
run: docker-compose run web bin/spec_controllers
61+
run: docker compose run web bin/spec_controllers
6262

6363
spec_features:
6464
runs-on: ubuntu-latest
@@ -72,11 +72,11 @@ jobs:
7272
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
7373
git submodule update --init --recursive
7474
- name: Docker compose build
75-
run: docker-compose build
75+
run: docker compose build
7676
- name: Setup database & test env
77-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
77+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
7878
- name: Run spec_features tests
79-
run: docker-compose run web bin/spec_features
79+
run: docker compose run web bin/spec_features
8080

8181
spec_lib:
8282
runs-on: ubuntu-latest
@@ -90,11 +90,11 @@ jobs:
9090
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
9191
git submodule update --init --recursive
9292
- name: Docker compose build
93-
run: docker-compose build
93+
run: docker compose build
9494
- name: Setup database & test env
95-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
95+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
9696
- name: Run spec_lib tests
97-
run: docker-compose run web bin/spec_lib
97+
run: docker compose run web bin/spec_lib
9898

9999
spec_integration:
100100
runs-on: ubuntu-latest
@@ -108,32 +108,8 @@ jobs:
108108
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
109109
git submodule update --init --recursive
110110
- name: Docker compose build
111-
run: docker-compose build
111+
run: docker compose build
112112
- name: Setup database & test env
113-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
113+
run: docker compose run web bin/rake db:create db:schema:load RAILS_ENV=test
114114
- name: Run spec_integration tests
115-
run: docker-compose run web bin/spec_integration
116-
117-
spec_usermanual:
118-
runs-on: ubuntu-latest
119-
steps:
120-
- name: Checkout repository
121-
uses: actions/checkout@v2
122-
with:
123-
submodules: false
124-
- name: Setup git submodules
125-
run: |
126-
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
127-
git submodule update --init --recursive
128-
- name: Docker compose build
129-
run: docker-compose build
130-
- name: Setup database & test env
131-
run: docker-compose run web bin/rake db:create db:schema:load RAILS_ENV=test
132-
- name: Run spec_usermanual tests
133-
run: docker-compose run web bin/spec_usermanual
134-
- name: Update manual to testmycode-usermanual
135-
uses: JamesIves/github-pages-deploy-action@4.1.3
136-
with:
137-
branch: gh-pages
138-
folder: doc/usermanual
139-
target-folder: usermanual
115+
run: docker compose run web bin/spec_integration

‎.github/workflows/rubocop.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v2
15-
- name: Set up Ruby 2.6
15+
- name: Set up Ruby 3.0
1616
uses: ruby/setup-ruby@v1
1717
with:
18-
ruby-version: 2.6
18+
ruby-version: 3.0
1919
- name: Cache gems
2020
uses: actions/cache@v1
2121
with:

0 commit comments

Comments
 (0)
Please sign in to comment.