Skip to content

Commit 548290b

Browse files
authored
Merge branch 'master' into test-local-source-overrides-cache
2 parents cc81b8b + 359fc3a commit 548290b

File tree

1,088 files changed

+18793
-16049
lines changed

Some content is hidden

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

1,088 files changed

+18793
-16049
lines changed

.changelog.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,19 @@ release_date_format: "%Y-%m-%d"
1313
entry_wrapping: 74
1414

1515
changelog_label_mapping:
16-
"rubygems: security": "### Security:"
17-
"rubygems: breaking change": "### Breaking changes:"
18-
"rubygems: deprecation": "### Deprecations:"
1916
"rubygems: feature": "### Features:"
2017
"rubygems: performance": "### Performance:"
2118
"rubygems: enhancement": "### Enhancements:"
2219
"rubygems: bug fix": "### Bug fixes:"
20+
"rubygems: security": "### Security:"
21+
"rubygems: breaking change": "### Breaking changes:"
22+
"rubygems: deprecation": "### Deprecations:"
2323
"rubygems: documentation": "### Documentation:"
2424
"rubygems: skip changelog": null
2525

2626
patch_level_labels:
27-
- "rubygems: security"
28-
- "rubygems: deprecation"
2927
- "rubygems: enhancement"
3028
- "rubygems: bug fix"
31-
- "rubygems: performance"
29+
- "rubygems: security"
3230
- "rubygems: documentation"
3331
- "rubygems: skip changelog"

.github/workflows/bundler.yml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,29 @@ jobs:
3030

3131
ruby:
3232
- { name: ruby-3.2, value: 3.2.9 }
33-
- { name: ruby-3.3, value: 3.3.9 }
34-
- { name: ruby-3.4, value: 3.4.5 }
33+
- { name: ruby-3.3, value: 3.3.10 }
34+
- { name: ruby-3.4, value: 3.4.8 }
35+
- { name: ruby-4.0, value: 4.0.0 }
3536

3637
include:
3738
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.2, value: 3.2.9 }, timeout: 90 }
38-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.3, value: 3.3.9 }, timeout: 90 }
39-
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.4, value: 3.4.5 }, timeout: 90 }
40-
41-
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.2, value: 3.2.9 }, timeout: 150 }
42-
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.9 }, timeout: 150 }
43-
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.4, value: 3.4.5 }, timeout: 150 }
39+
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.3, value: 3.3.10 }, timeout: 90 }
40+
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-3.4, value: 3.4.8 }, timeout: 90 }
41+
- { os: { name: macOS, value: macos-15 }, ruby: { name: ruby-4.0, value: 4.0.0 }, timeout: 90 }
42+
43+
# Ruby 3.2 is about 20 minutes slower than 3.3/3.4, so it will be excluded from testing.
44+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.10 }, timeout: 150, group: a }
45+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.10 }, timeout: 150, group: b }
46+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.10 }, timeout: 150, group: c }
47+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.3, value: 3.3.10 }, timeout: 150, group: d }
48+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.4, value: 3.4.8 }, timeout: 150, group: a }
49+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.4, value: 3.4.8 }, timeout: 150, group: b }
50+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.4, value: 3.4.8 }, timeout: 150, group: c }
51+
- { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-3.4, value: 3.4.8 }, timeout: 150, group: d }
52+
# - { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-4.0, value: 4.0.0 }, timeout: 150, group: a }
53+
# - { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-4.0, value: 4.0.0 }, timeout: 150, group: b }
54+
# - { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-4.0, value: 4.0.0 }, timeout: 150, group: c }
55+
# - { os: { name: Windows, value: windows-2025 }, ruby: { name: ruby-4.0, value: 4.0.0 }, timeout: 150, group: d }
4456

4557
- { os: { name: Ubuntu, value: ubuntu-24.04 }, ruby: { name: jruby, value: jruby-10.0.2.0 } }
4658
- { os: { name: Windows, value: windows-2025 }, ruby: { name: jruby, value: jruby-10.0.2.0 } }
@@ -49,16 +61,16 @@ jobs:
4961
RGV: ..
5062
RUBYOPT: --disable-gems
5163
steps:
52-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
64+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5365
with:
5466
persist-credentials: false
5567
- name: Setup ruby
56-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
68+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
5769
with:
5870
ruby-version: ${{ matrix.ruby.value }}
5971
bundler: none
6072
- name: Setup java
61-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
73+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
6274
with:
6375
distribution: temurin
6476
java-version: 21.0.7
@@ -70,7 +82,12 @@ jobs:
7082
run: |
7183
bin/parallel_rspec
7284
working-directory: ./bundler
73-
if: matrix.ruby.name != 'jruby'
85+
if: matrix.ruby.name != 'jruby' && matrix.os.name != 'Windows'
86+
- name: Run Test (CRuby on Windows - Group ${{ matrix.group }})
87+
run: |
88+
bin/parallel_rspec --tag windows_${{ matrix.group }}
89+
working-directory: ./bundler
90+
if: matrix.ruby.name != 'jruby' && matrix.os.name == 'Windows'
7491
- name: Run Test (JRuby)
7592
run: |
7693
bin/parallel_rspec --tag jruby_only --tag jruby

.github/workflows/daily-bundler.yml

Lines changed: 0 additions & 55 deletions
This file was deleted.

.github/workflows/daily-rubygems.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/install-rubygems.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
- { name: openssl, value: true }
3232
- { name: no-openssl, value: false }
3333
steps:
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
persist-credentials: false
3737
- name: Setup ruby
38-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
38+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
3939
with:
4040
ruby-version: ${{ matrix.ruby.value }}
4141
bundler: none
@@ -124,16 +124,16 @@ jobs:
124124
- { name: "3.4", value: 3.4.5 }
125125
- { name: jruby, value: jruby-10.0.2.0, rails-args: --skip-webpack-install }
126126
steps:
127-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
127+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
128128
with:
129129
persist-credentials: false
130130
- name: Setup ruby
131-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
131+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
132132
with:
133133
ruby-version: ${{ matrix.ruby.value }}
134134
bundler: none
135135
- name: Setup java
136-
uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
136+
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
137137
with:
138138
distribution: temurin
139139
java-version: 21.0.7
@@ -166,11 +166,11 @@ jobs:
166166
- dev
167167
- system
168168
steps:
169-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
169+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
170170
with:
171171
persist-credentials: false
172172
- name: Setup original ruby
173-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
173+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
174174
with:
175175
ruby-version: 3.2
176176
bundler: none
@@ -191,7 +191,7 @@ jobs:
191191
GEM_HOME: bar
192192
GEM_PATH: bar
193193
- name: Setup final ruby
194-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
194+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
195195
with:
196196
ruby-version: 3.3
197197
bundler: none
@@ -216,11 +216,11 @@ jobs:
216216
- { name: "3.4", value: 3.4.5 }
217217

218218
steps:
219-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
219+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
220220
with:
221221
persist-credentials: false
222222
- name: Setup ruby
223-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # v1.267.0
223+
uses: ruby/setup-ruby@b90be12699fdfcbee4440c2bba85f6f460446bb0 # v1.279.0
224224
with:
225225
ruby-version: ${{ matrix.ruby.value }}
226226
bundler: none
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
codespell==2.4.1
22
yamllint==1.37.1
3-
zizmor==1.16.1
3+
zizmor==1.19.0

.github/workflows/read-only.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- { name: ruby-3.4, value: 3.4.5 }
3232

3333
steps:
34-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
persist-credentials: false
3737
- name: Basic usage on a read-only filesystem

0 commit comments

Comments
 (0)