Skip to content

Commit 6694e0a

Browse files
sarahsehrsarahsehr
authored
Merge branch 'rubygems:master' into improveErrorForLoadingBrokenPlugin
2 parents e8b2517 + 6ccc6ba commit 6694e0a

File tree

313 files changed

+10296
-6971
lines changed

Some content is hidden

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

313 files changed

+10296
-6971
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/ISSUE_TEMPLATE/bundler-related-issue.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ If you're still stuck, please fill in the following sections so we can process y
2323

2424
### Describe the problem as clearly as you can
2525

26-
<!-- Replace this with an explanation of the problem you are having. Be as much clear and precise as you can. -->
26+
<!-- Replace this with an explanation of your problem. Be as clear and precise as you can. -->
2727

2828
### Did you try upgrading rubygems & bundler?
2929

@@ -44,7 +44,7 @@ might do the trick, and will also save us some time :)
4444

4545
<!--
4646
47-
Fill this with a list of steps maintainers can follow to reproduce your issue. Note that while you are seeing this issue in your computer, maintainers might not see the same thing on theirs. There is a number of things that could influence this:
47+
Fill this with a list of steps maintainers can follow to reproduce your issue. Note that while you see this issue in your computer, maintainers might not see the same thing on theirs. There are many things that could influence this:
4848
4949
* How your ruby is setup (OS package, from source, using a version manager).
5050
* How bundler & rubygems are configured.
@@ -53,7 +53,7 @@ Fill this with a list of steps maintainers can follow to reproduce your issue. N
5353
5454
The more complete the steps to simulate your particular environment are, the easier it will be for maintainers to reproduce your issue on their machines.
5555
56-
Ideally, we recommend you to set up the list of steps as a [Dockerfile](https://docs.docker.com/get-started/). A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
56+
Ideally, we recommend you set up the list of steps as a [Dockerfile](https://docs.docker.com/get-started/). A Dockerfile provides a neutral environment that should give the same results, no matter where it's run.
5757
5858
-->
5959

‎.github/workflows/bundler.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,44 @@ jobs:
3030

3131
ruby:
3232
- { name: ruby-3.0, value: 3.0.7 }
33-
- { name: ruby-3.1, value: 3.1.5 }
33+
- { name: ruby-3.1, value: 3.1.6 }
3434
- { name: ruby-3.2, value: 3.2.4 }
35-
- { name: ruby-3.3, value: 3.3.1 }
35+
- { name: ruby-3.3, value: 3.3.4 }
3636

3737
bundler:
3838
- { name: 2, value: '' }
3939
- { name: 3, value: 3.0.0 }
4040

4141
include:
4242
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 90 }
43-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 90 }
43+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 90 }
4444
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 90 }
45-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.4 }, timeout: 90 }
4646

4747
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 150 }
48-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 150 }
48+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 150 }
4949
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 150 }
50-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 150 }
50+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.4 }, timeout: 150 }
5151

5252
env:
5353
RGV: ..
5454
RUBYOPT: --disable-gems
5555
steps:
56-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
56+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
5757
- name: Setup ruby
58-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
58+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
5959
with:
6060
ruby-version: ${{ matrix.ruby.value }}
6161
bundler: none
6262
- name: Install graphviz (Ubuntu)
6363
run: sudo apt-get install graphviz -y
6464
if: matrix.bundler.value == '' && matrix.os.name == 'Ubuntu'
65-
- name: Prepare dependencies
66-
run: |
67-
bin/rake spec:parallel_deps
6865
- name: Replace version
6966
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
7067
if: matrix.bundler.value != ''
68+
- name: Prepare dependencies
69+
run: |
70+
bin/rake spec:parallel_deps
7171
- name: Run Test
7272
run: |
7373
bin/parallel_rspec

‎.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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2323

2424
- name: Set up Ruby
25-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
25+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
2626
with:
2727
ruby-version: ruby-head
2828
bundler: none

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,33 @@ jobs:
1818
matrix:
1919
os: [ ubuntu-22.04 ]
2020
ruby: [ ruby-head, truffleruby-head ]
21-
cargo: [ stable ]
2221
include:
23-
- { os: windows-2022, ruby: mswin, cargo: stable-x86_64-pc-windows-msvc }
22+
- { os: windows-2022, ruby: mswin }
2423
env:
2524
TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
2625
steps:
27-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
26+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2827

2928
- name: Set up Ruby
30-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
29+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
3130
with:
3231
ruby-version: ${{ matrix.ruby }}
3332
bundler: none
3433

35-
- uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8
36-
with:
37-
toolchain: ${{ matrix.cargo }}
38-
components: rustfmt
39-
4034
- name: Show Ruby version
4135
run: ruby --version
4236

37+
- name: Configure bindgen
38+
shell: pwsh
39+
run: |
40+
echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
41+
echo "BINDGEN_EXTRA_CLANG_ARGS=$((gcm clang).source -replace "bin\clang.exe","include")" >> $env:GITHUB_ENV
42+
if: matrix.ruby == 'mswin'
43+
4344
- name: Test rubygems
4445
run: |
45-
rake setup
46-
rake test
46+
bin/rake setup
47+
bin/rake test
4748
4849
- name: Get previous status
4950
if: always()

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ jobs:
2323
matrix:
2424
ruby:
2525
- { name: "3.0", value: 3.0.7 }
26-
- { name: "3.1", value: 3.1.5 }
26+
- { name: "3.1", value: 3.1.6 }
2727
- { name: "3.2", value: 3.2.4 }
28-
- { name: "3.3", value: 3.3.1 }
29-
- { name: jruby, value: jruby-9.4.7.0 }
28+
- { name: "3.3", value: 3.3.4 }
29+
- { name: jruby, value: jruby-9.4.8.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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
37+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -99,14 +99,14 @@ jobs:
9999
fail-fast: false
100100
matrix:
101101
ruby:
102-
- { name: "3.1", value: 3.1.5 } # Rails 7
102+
- { name: "3.1", value: 3.1.6 } # Rails 7
103103
- { name: "3.2", value: 3.2.4 } # Rails 7
104-
- { name: "3.3", value: 3.3.1 } # Rails 7
105-
- { name: jruby-9.4, value: jruby-9.4.7.0, rails-args: "--skip-webpack-install" } # Rails 6
104+
- { name: "3.3", value: 3.3.4 } # Rails 7
105+
- { name: jruby-9.4, value: jruby-9.4.8.0, rails-args: "--skip-webpack-install" } # Rails 6
106106
steps:
107-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
107+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
109+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
110110
with:
111111
ruby-version: ${{ matrix.ruby.value }}
112112
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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
37+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
3838
with:
39-
ruby-version: jruby-9.4.7.0
39+
ruby-version: jruby-9.4.8.0
4040
bundler: none
4141
- name: Setup java
4242
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,38 +26,38 @@ jobs:
2626

2727
ruby:
2828
- { name: ruby-3.0, value: 3.0.7 }
29-
- { name: ruby-3.1, value: 3.1.5 }
29+
- { name: ruby-3.1, value: 3.1.6 }
3030
- { name: ruby-3.2, value: 3.2.4 }
31-
- { name: ruby-3.3, value: 3.3.1 }
31+
- { name: ruby-3.3, value: 3.3.4 }
3232

3333
bundler:
3434
- { name: 2, value: '' }
3535
- { name: 3, value: 3.0.0 }
3636

3737
include:
3838
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
39-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
39+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
4040
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
41-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
41+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.4 } }
4242
env:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
4545
steps:
46-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
46+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
4747
- name: Setup ruby
48-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
48+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
52-
- name: Prepare dependencies
53-
run: bin/rake spec:deps
5452
- name: Replace version
5553
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
5654
if: matrix.bundler.value != ''
55+
- name: Prepare dependencies
56+
run: bin/rake spec:deps
5757
- name: Run Test
5858
run: bin/rake spec:realworld
5959
- name: Upload used cassettes as artifact
60-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
60+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
6161
with:
6262
name: cassettes-bundler-${{ matrix.bundler.name }}-${{ matrix.os.value }}-${{ matrix.ruby.name }}
6363
path: ./bundler/spec/support/artifice/used_cassettes.txt
@@ -71,29 +71,29 @@ jobs:
7171
matrix:
7272
include:
7373
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
74-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
74+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7575
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
76-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
76+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.4 } }
7777
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.7 } }
78-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.5 } }
78+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7979
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
80-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.1 } }
80+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.4 } }
8181
steps:
82-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
82+
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
8383
- name: Setup ruby
84-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
84+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
8585
with:
8686
ruby-version: ${{ matrix.ruby.value }}
8787
bundler: none
88-
- name: Prepare dependencies
89-
run: bin/rake spec:deps
9088
- name: Replace version
9189
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
9290
if: matrix.bundler.value != ''
91+
- name: Prepare dependencies
92+
run: bin/rake spec:deps
9393
- name: Run Test
9494
run: bin/rake spec:realworld
9595
- name: Upload used cassettes as artifact
96-
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
96+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
9797
with:
9898
name: cassettes-system-rubygems-bundler-${{ matrix.bundler.name }}-${{ matrix.ruby.name }}
9999
path: ./bundler/spec/support/artifice/used_cassettes.txt
@@ -104,16 +104,16 @@ 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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
109+
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
110110
with:
111-
ruby-version: 3.3.1
111+
ruby-version: 3.3.4
112112
bundler: none
113113
- name: Prepare dependencies
114-
run: rake setup
114+
run: bin/rake setup
115115
- name: Download all used cassettes as artifacts
116-
uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
116+
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
117117
with:
118118
path: ./bundler/spec/support/artifice/used_vcr_cassettes
119119
- name: Check unused cassettes

0 commit comments

Comments
 (0)