Skip to content

Commit 5cc66a2

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #8095 from rubygems/release/bundler_2.5.21_rubygems_3.5.21
Prepare RubyGems 3.5.21 and Bundler 2.5.21
2 parents a0fc995 + 0577d01 commit 5cc66a2

Some content is hidden

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

64 files changed

+382
-242
lines changed

‎.github/workflows/bundler.yml‎

Lines changed: 3 additions & 3 deletions
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 }
@@ -53,9 +53,9 @@ jobs:
5353
RGV: ..
5454
RUBYOPT: --disable-gems
5555
steps:
56-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
56+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5757
- name: Setup ruby
58-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
58+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
5959
with:
6060
ruby-version: ${{ matrix.ruby.value }}
6161
bundler: none

‎.github/workflows/daily-bundler.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ 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: ..
2121
steps:
22-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2323

2424
- name: Set up Ruby
25-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
25+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
2626
with:
2727
ruby-version: ruby-head
2828
bundler: none

‎.github/workflows/daily-rubygems.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ 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 }
2323
env:
2424
TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
2525
steps:
26-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
26+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2727

2828
- name: Set up Ruby
29-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
29+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
3030
with:
3131
ruby-version: ${{ matrix.ruby }}
3232
bundler: none

‎.github/workflows/install-rubygems.yml‎

Lines changed: 6 additions & 6 deletions
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:
@@ -32,9 +32,9 @@ jobs:
3232
- { name: "openssl", value: true }
3333
- { name: "no-openssl", value: false }
3434
steps:
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
35+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
37+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -104,14 +104,14 @@ jobs:
104104
- { name: "3.3", value: 3.3.5 }
105105
- { name: jruby-9.4, value: jruby-9.4.8.0, rails-args: "--skip-webpack-install" }
106106
steps:
107-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
107+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
109+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
110110
with:
111111
ruby-version: ${{ matrix.ruby.value }}
112112
bundler: none
113113
- name: Setup java
114-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
114+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
115115
with:
116116
distribution: temurin
117117
java-version: 19.0.2

‎.github/workflows/jruby-bundler.yml‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,46 +20,48 @@ 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:
35-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
37+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3638
- name: Setup ruby
37-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
39+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
3840
with:
3941
ruby-version: jruby-9.4.8.0
4042
bundler: none
4143
- name: Setup java
42-
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
44+
uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
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: 9 additions & 9 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 }
@@ -43,9 +43,9 @@ jobs:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
4545
steps:
46-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
46+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
4747
- name: Setup ruby
48-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
48+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
@@ -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:
@@ -79,9 +79,9 @@ jobs:
7979
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
8080
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.5 } }
8181
steps:
82-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
82+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
8383
- name: Setup ruby
84-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
84+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
8585
with:
8686
ruby-version: ${{ matrix.ruby.value }}
8787
bundler: none
@@ -102,11 +102,11 @@ 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:
107-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
107+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
109+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
110110
with:
111111
ruby-version: 3.3.5
112112
bundler: none

‎.github/workflows/ruby-core.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@ 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:
2424
target: [Rubygems, Bundler]
2525
steps:
2626
- name: Set up latest ruby head
27-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
27+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
2828
with:
2929
ruby-version: head
3030
bundler: none
3131
- name: Save latest buildable revision to environment
3232
run: echo "REF=$(ruby -v | cut -d')' -f1 | cut -d' ' -f5)" >> $GITHUB_ENV
33-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
33+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3434
with:
3535
repository: ruby/ruby
3636
path: ruby/ruby
@@ -49,7 +49,7 @@ jobs:
4949
./configure -C --disable-install-doc
5050
make -j2
5151
working-directory: ruby/ruby
52-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
52+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
5353
with:
5454
path: rubygems/rubygems
5555
- name: Sync tools

‎.github/workflows/rubygems.yml‎

Lines changed: 5 additions & 5 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,15 +34,15 @@ 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:
43-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
43+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
4444
- name: Setup ruby
45-
uses: ruby/setup-ruby@f321cf5a4d1533575411f8752cf25b86478b0442 # v1.193.0
45+
uses: ruby/setup-ruby@c04af2bb7258bb6a03df1d3c1865998ac9390972 # v1.194.0
4646
with:
4747
ruby-version: ${{ matrix.ruby.value }}
4848
bundler: none

‎.github/workflows/scorecards.yml‎

Lines changed: 3 additions & 3 deletions
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
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: "Checkout code"
30-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
30+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3131
with:
3232
persist-credentials: false
3333

@@ -49,6 +49,6 @@ jobs:
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
52+
uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
5353
with:
5454
sarif_file: results.sarif

‎.github/workflows/spell.yml‎

Lines changed: 2 additions & 2 deletions
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:
18-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
18+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1919
- uses: codespell-project/actions-codespell@406322ec52dd7b488e48c1c4b82e2a8b3a1bf630 # v2.1

0 commit comments

Comments
 (0)