Skip to content

Commit c94aa62

Browse files
authored
Merge pull request #454 from opf/housekeeping/ruby-4.0.2
Bump Ruby versions, supporting Ruby 4.0.x for development
2 parents d93c35d + b664786 commit c94aa62

18 files changed

Lines changed: 60 additions & 39 deletions

File tree

.changeset/bump-ruby-versions.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@openproject/primer-view-components': minor
3+
---
4+
5+
Bump Ruby versions, supporting Ruby 4.0.x for development and testing against 3.4 and 4.0 on CI. Also aligns Rails version with core.

.github/version-matrix.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
{
33
"label": "last",
44
"rails_version": "8.0.0",
5-
"ruby_version": "3.3"
5+
"ruby_version": "3.4"
66
},
77
{
8-
"label": "dotcom",
9-
"rails_version": "8.1.0.beta1",
10-
"ruby_version": "3.4"
8+
"label": "core",
9+
"rails_version": "8.1.3",
10+
"ruby_version": "4.0"
1111
},
1212
{
1313
"label": "latest",
1414
"rails_version": "latest",
15-
"ruby_version": "3.4"
15+
"ruby_version": "4.0"
1616
}
1717
]

.github/workflows/demo-preview-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Do this before repo checkout to prevent running bundle install
3535
- uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
3636
with:
37-
ruby-version: '3.3'
37+
ruby-version: '3.4'
3838

3939
- name: Check out repo
4040
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

.github/workflows/demo-production-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Ruby
2525
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
2626
with:
27-
ruby-version: '3.3'
27+
ruby-version: '3.4'
2828
bundler-cache: true
2929
working-directory: 'demo/'
3030
- name: Docker login
@@ -78,12 +78,12 @@ jobs:
7878
- name: Setup Ruby
7979
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
8080
with:
81-
ruby-version: '3.3'
81+
ruby-version: '3.4'
8282
bundler-cache: true
8383
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
8484
with:
8585
path: demo/gemfiles/vendor/bundle
86-
key: gems-build-kuby-main-ruby-3.3.x-${{ hashFiles('demo/gemfiles/kuby.gemfile.lock') }}
86+
key: gems-build-kuby-main-ruby-3.4.x-${{ hashFiles('demo/gemfiles/kuby.gemfile.lock') }}
8787
- name: Bundle
8888
run: |
8989
gem install bundler -v '~> 2.3'

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
test/**/*.rb
6464
- uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
6565
with:
66-
ruby-version: '3.3'
66+
ruby-version: '3.4'
6767
bundler-cache: true
6868
- name: Lint with Rubocop
6969
run: script/rubocop --format github
@@ -85,7 +85,7 @@ jobs:
8585
app/components/**/*.erb
8686
- uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
8787
with:
88-
ruby-version: '3.3'
88+
ruby-version: '3.4'
8989
bundler-cache: true
9090
- name: Lint with ERB Lint
9191
run: script/erblint --format github

.github/workflows/preview-deploy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,21 @@ jobs:
4040
- name: Install lib deps
4141
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
4242
with:
43-
ruby-version: '3.3'
43+
ruby-version: '3.4'
4444
bundler-cache: true
4545
env:
4646
BUNDLE_GEMFILE: Gemfile
4747
- name: Install demo app deps
4848
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
4949
with:
50-
ruby-version: '3.3'
50+
ruby-version: '3.4'
5151
bundler-cache: true
5252
env:
5353
BUNDLE_GEMFILE: demo/Gemfile
5454
- name: Install Kuby deps
5555
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
5656
with:
57-
ruby-version: '3.3'
57+
ruby-version: '3.4'
5858
bundler-cache: true
5959
env:
6060
BUNDLE_GEMFILE: demo/gemfiles/kuby.gemfile

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Ruby
2020
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
2121
with:
22-
ruby-version: "3.3"
22+
ruby-version: "3.4"
2323
bundler-cache: true
2424
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
2525
with:
@@ -70,7 +70,7 @@ jobs:
7070
- name: Setup Ruby
7171
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
7272
with:
73-
ruby-version: "3.3"
73+
ruby-version: "3.4"
7474

7575
- name: Install dependencies
7676
run: |

.github/workflows/static-files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
persist-credentials: false
2828
- uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
2929
with:
30-
ruby-version: '3.3'
30+
ruby-version: '3.4'
3131
bundler-cache: true
3232
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
3333
with:

.github/workflows/test-selectors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Ruby
2626
uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
2727
with:
28-
ruby-version: "3.2"
28+
ruby-version: "3.4"
2929
bundler-cache: true
3030
- name: Setup Node
3131
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5

.github/workflows/test-system.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535
- uses: ruby/setup-ruby@6aaa311d81eba98ae12eaffbcb63296ace0efcde # v1
3636
with:
37-
ruby-version: "3.2"
37+
ruby-version: "3.4"
3838
bundler-cache: true
3939
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
4040
with:

0 commit comments

Comments
 (0)