Skip to content

Commit 4afb2d4

Browse files
Merge pull request #7665 from rubygems/release/bundler_2.5.11_rubygems_3.5.11
Prepare RubyGems 3.5.11 and Bundler 2.5.11
2 parents 24cac00 + 86f54aa commit 4afb2d4

File tree

120 files changed

+1207
-531
lines changed

Some content is hidden

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

120 files changed

+1207
-531
lines changed

.codespellignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
crate
2+
checkin
23
falsy
34
filetest
45
fo

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
check-filenames=
33
check-hidden=
44
ignore-words=.codespellignore
5-
skip=*.pem,.git,man,vcr_cassettes,vendor,./lib/rubygems/net*,./lib/rubygems/resolv,./lib/rubygems/tsort,./lib/rubygems/timeout,./lib/rubygems/optparse
5+
skip=CODE_OF_CONDUCT.md,*.pem,.git,./bundler/tmp,./bundler/lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt,man,vcr_cassettes,vendor,./lib/rubygems/net*,./lib/rubygems/resolv,./lib/rubygems/tsort,./lib/rubygems/timeout,./lib/rubygems/optparse

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"remoteUser": "vscode",
88
"workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
99
// Use 'postCreateCommand' to run commands after the container is created.
10-
"onCreateCommand": "rake setup",
10+
"onCreateCommand": "bin/rake setup",
1111
// Use 'updateContentCommand' to run commands when the container is updated.
12-
"updateContentCommand": "rake update",
12+
"updateContentCommand": "bin/rake update",
1313
// Configure tool-specific properties.
1414
"containerEnv": {
1515
"EDITOR": "code --wait",

.github/workflows/bundler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
RGV: ..
5454
RUBYOPT: --disable-gems
5555
steps:
56-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
56+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
5757
- name: Setup ruby
58-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
58+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
5959
with:
6060
ruby-version: ${{ matrix.ruby.value }}
6161
bundler: none

.github/workflows/daily-bundler.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
env:
2020
RGV: ..
2121
steps:
22-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
22+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2323

2424
- name: Set up Ruby
25-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
25+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
2626
with:
2727
ruby-version: ruby-head
2828
bundler: none

.github/workflows/daily-rubygems.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
env:
2525
TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
2626
steps:
27-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
27+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
2828

2929
- name: Set up Ruby
30-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
30+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
3131
with:
3232
ruby-version: ${{ matrix.ruby }}
3333
bundler: none
@@ -42,8 +42,8 @@ jobs:
4242

4343
- name: Test rubygems
4444
run: |
45-
rake setup
46-
rake test
45+
bin/rake setup
46+
bin/rake test
4747
4848
- name: Get previous status
4949
if: always()

.github/workflows/install-rubygems.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
- { name: "3.1", value: 3.1.5 }
2727
- { name: "3.2", value: 3.2.4 }
2828
- { name: "3.3", value: 3.3.1 }
29-
- { name: jruby, value: jruby-9.4.6.0 }
29+
- { name: jruby, value: jruby-9.4.7.0 }
3030
- { name: truffleruby, value: truffleruby-24.0.1 }
3131
openssl:
3232
- { name: "openssl", value: true }
3333
- { name: "no-openssl", value: false }
3434
steps:
35-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
35+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
37+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -85,6 +85,9 @@ jobs:
8585
- name: Check bundler install didn't hit the network
8686
run: if grep -q 'GET http' output.txt; then false; else true; fi
8787
working-directory: ./bundler
88+
- name: Workaround bad nio4r release on JRuby, so that Rails can be installed below
89+
run: gem install nio4r --version 2.7.1
90+
if: matrix.ruby.name == 'jruby'
8891
- name: Check rails can be installed
8992
run: gem install rails --verbose --backtrace
9093
timeout-minutes: 10
@@ -99,11 +102,11 @@ jobs:
99102
- { name: "3.1", value: 3.1.5 } # Rails 7
100103
- { name: "3.2", value: 3.2.4 } # Rails 7
101104
- { name: "3.3", value: 3.3.1 } # Rails 7
102-
- { name: jruby-9.4, value: jruby-9.4.6.0, rails-args: "--skip-webpack-install" } # Rails 6
105+
- { name: jruby-9.4, value: jruby-9.4.7.0, rails-args: "--skip-webpack-install" } # Rails 6
103106
steps:
104-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
107+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
105108
- name: Setup ruby
106-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
109+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
107110
with:
108111
ruby-version: ${{ matrix.ruby.value }}
109112
bundler: none

.github/workflows/jruby-bundler.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
os: [ubuntu-22.04, windows-2022]
3333

3434
steps:
35-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
35+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
37+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
3838
with:
39-
ruby-version: jruby-9.4.6.0
39+
ruby-version: jruby-9.4.7.0
4040
bundler: none
4141
- name: Setup java
4242
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1

.github/workflows/realworld-bundler.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
4545
steps:
46-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
46+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
4747
- name: Setup ruby
48-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
48+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
@@ -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.1 } }
8181
steps:
82-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
82+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
8383
- name: Setup ruby
84-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
84+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
8585
with:
8686
ruby-version: ${{ matrix.ruby.value }}
8787
bundler: none
@@ -104,14 +104,14 @@ jobs:
104104
needs: [bundler, system_rubygems_bundler]
105105
runs-on: ubuntu-22.04
106106
steps:
107-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
107+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
109+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
110110
with:
111111
ruby-version: 3.3.1
112112
bundler: none
113113
- name: Prepare dependencies
114-
run: rake setup
114+
run: bin/rake setup
115115
- name: Download all used cassettes as artifacts
116116
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
117117
with:

.github/workflows/ruby-core.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ jobs:
2424
target: [Rubygems, Bundler]
2525
steps:
2626
- name: Set up latest ruby head
27-
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
27+
uses: ruby/setup-ruby@943103cae7d3f1bb1e4951d5fcc7928b40e4b742 # v1.177.1
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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
33+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
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@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
52+
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
5353
with:
5454
path: rubygems/rubygems
5555
- name: Sync tools

0 commit comments

Comments
 (0)