Skip to content

Commit 30ee2b5

Browse files
Merge pull request #8066 from rubygems/deivid-rodriguez/ubuntu-24
Upgrade CI to run on ubuntu 24.04 (cherry picked from commit 359d988)
1 parent a0fc995 commit 30ee2b5

17 files changed

+33
-29
lines changed

.github/workflows/bundler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
os:
29-
- { name: Ubuntu, value: ubuntu-22.04 }
29+
- { name: Ubuntu, value: ubuntu-24.04 }
3030

3131
ruby:
3232
- { name: ruby-3.0, value: 3.0.7 }

.github/workflows/daily-bundler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ defaults:
1414
jobs:
1515
daily_bundler:
1616
name: Bundler (ruby-head)
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
1818
if: github.repository == 'rubygems/rubygems'
1919
env:
2020
RGV: ..

.github/workflows/daily-rubygems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
os: [ ubuntu-22.04 ]
19+
os: [ ubuntu-24.04 ]
2020
ruby: [ ruby-head, truffleruby-head ]
2121
include:
2222
- { os: windows-2022, ruby: mswin }

.github/workflows/install-rubygems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
1717
jobs:
1818
install_rubygems_ubuntu:
1919
name: Install Rubygems on Ubuntu (${{ matrix.ruby.name }}, ${{ matrix.openssl.name }})
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
strategy:
2222
fail-fast: false
2323
matrix:

.github/workflows/jruby-bundler.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,18 @@ defaults:
2020

2121
jobs:
2222
jruby_bundler:
23-
name: Bundler on JRuby (${{ matrix.os }})
24-
runs-on: ${{ matrix.os }}
23+
name: Bundler on JRuby (${{ matrix.os.name }})
24+
runs-on: ${{ matrix.os.value }}
2525

2626
env:
2727
RGV: ..
2828

2929
strategy:
3030
fail-fast: false
3131
matrix:
32-
os: [ubuntu-22.04, windows-2022]
32+
os:
33+
- { name: Ubuntu, value: ubuntu-24.04 }
34+
- { name: Windows, value: windows-2022 }
3335

3436
steps:
3537
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -43,23 +45,23 @@ jobs:
4345
with:
4446
distribution: temurin
4547
java-version: 19.0.2
46-
if: "!startsWith(matrix.os.name, 'ubuntu')"
48+
if: matrix.os.name != 'Ubuntu'
4749
- name: Prepare dependencies
4850
run: |
4951
bin/rake spec:parallel_deps
5052
- name: Run Test
5153
run: |
5254
bin/parallel_rspec --tag jruby_only --tag jruby
5355
working-directory: ./bundler
54-
if: startsWith(matrix.os.name, 'ubuntu')
56+
if: matrix.os.name == 'Ubuntu'
5557
- name: Install local bundler
5658
run: |
5759
bin/rake bundler:install:local
58-
if: startsWith(matrix.os.name, 'ubuntu')
60+
if: matrix.os.name == 'Ubuntu'
5961
- name: Run a warbler project
6062
run: |
61-
cd spec/realworld/fixtures/warbler
63+
cd bundler/spec/realworld/fixtures/warbler
6264
bundle install
6365
bundle exec warble
6466
java -jar warbler.jar
65-
if: startsWith(matrix.os.name, 'ubuntu')
67+
if: matrix.os.name == 'Ubuntu'

.github/workflows/realworld-bundler.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os:
25-
- { name: Ubuntu, value: ubuntu-22.04 }
25+
- { name: Ubuntu, value: ubuntu-24.04 }
2626

2727
ruby:
2828
- { name: ruby-3.0, value: 3.0.7 }
@@ -65,7 +65,7 @@ jobs:
6565

6666
system_rubygems_bundler:
6767
name: Realworld Bundler ${{ matrix.bundler.name }} against system Rubygems (${{ matrix.ruby.name }})
68-
runs-on: ubuntu-22.04
68+
runs-on: ubuntu-24.04
6969
strategy:
7070
fail-fast: false
7171
matrix:
@@ -102,7 +102,7 @@ jobs:
102102
check_unused_cassettes:
103103
name: Check unused cassettes
104104
needs: [bundler, system_rubygems_bundler]
105-
runs-on: ubuntu-22.04
105+
runs-on: ubuntu-24.04
106106
steps:
107107
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108108
- name: Setup ruby

.github/workflows/ruby-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
1717
jobs:
1818
ruby_core:
1919
name: ${{matrix.target}} under a ruby-core setup
20-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2121
strategy:
2222
fail-fast: false
2323
matrix:

.github/workflows/rubygems.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os:
25-
- { name: Ubuntu, value: ubuntu-22.04 }
25+
- { name: Ubuntu, value: ubuntu-24.04 }
2626
- { name: macOS, value: macos-14 }
2727
- { name: Windows, value: windows-2022 }
2828

@@ -34,10 +34,10 @@ jobs:
3434

3535
include:
3636
- ruby: { name: jruby, value: jruby-9.4.8.0 }
37-
os: { name: Ubuntu, value: ubuntu-22.04 }
37+
os: { name: Ubuntu, value: ubuntu-24.04 }
3838

3939
- ruby: { name: truffleruby, value: truffleruby-24.0.1 }
40-
os: { name: Ubuntu, value: ubuntu-22.04 }
40+
os: { name: Ubuntu, value: ubuntu-24.04 }
4141

4242
steps:
4343
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions: read-all
1818
jobs:
1919
analysis:
2020
name: Scorecards analysis
21-
runs-on: ubuntu-latest
21+
runs-on: ubuntu-24.04
2222
permissions:
2323
# Needed to upload the results to code-scanning dashboard.
2424
security-events: write

.github/workflows/spell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313
jobs:
1414
spell:
1515
name: Check spelling
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-24.04
1717
steps:
1818
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1919
- uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1

0 commit comments

Comments
 (0)