Skip to content

Commit 8a2a14d

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #8677 from rubygems/release/bundler_2.6.9_rubygems_3.6.9
Prepare RubyGems 3.6.9 and Bundler 2.6.9
2 parents 2a353e4 + 93ed382 commit 8a2a14d

Some content is hidden

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

53 files changed

+1195
-338
lines changed

‎.github/workflows/bundler.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
ruby:
3232
- { name: ruby-3.1, value: 3.1.7 }
3333
- { name: ruby-3.2, value: 3.2.8 }
34-
- { name: ruby-3.3, value: 3.3.7 }
35-
- { name: ruby-3.4, value: 3.4.2 }
34+
- { name: ruby-3.3, value: 3.3.8 }
35+
- { name: ruby-3.4, value: 3.4.3 }
3636

3737
bundler:
3838
- { name: 2, value: '' }
@@ -41,13 +41,13 @@ jobs:
4141
include:
4242
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 90 }
4343
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 }, timeout: 90 }
44-
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 90 }
45-
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 }, timeout: 90 }
44+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.8 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.3 }, timeout: 90 }
4646

4747
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 150 }
4848
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 }, timeout: 150 }
49-
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 150 }
50-
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 }, timeout: 150 }
49+
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.8 }, timeout: 150 }
50+
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.3 }, timeout: 150 }
5151

5252
- { os: { name: Ubuntu, value: ubuntu-24.04 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
5353
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
@@ -57,8 +57,11 @@ jobs:
5757
RUBYOPT: --disable-gems
5858
steps:
5959
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
60+
# TODO:
61+
# * Go back to ruby/setup-ruby once https://github.com/ruby/setup-ruby/pull/762 is released
62+
# * Figure out regression in gcc packages, my fork is pinned to https://github.com/ntkme/setup-msys2-gcc/releases/tag/v20250509.003447 because newer releases break our tests for some reason
6063
- name: Setup ruby
61-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
64+
uses: deivid-rodriguez/setup-ruby@dev
6265
with:
6366
ruby-version: ${{ matrix.ruby.value }}
6467
bundler: none

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323

2424
- name: Set up Ruby
25-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
25+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
2626
with:
2727
ruby-version: ruby-head
2828
bundler: none

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727

2828
- name: Set up Ruby
29-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
29+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
3030
with:
3131
ruby-version: ${{ matrix.ruby }}
3232
bundler: none

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

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
ruby:
2525
- { name: "3.1", value: 3.1.7 }
2626
- { name: "3.2", value: 3.2.8 }
27-
- { name: "3.3", value: 3.3.7 }
28-
- { name: "3.4", value: 3.4.2 }
27+
- { name: "3.3", value: 3.3.8 }
28+
- { name: "3.4", value: 3.4.3 }
2929
- { name: jruby, value: jruby-9.4.12.0 }
3030
- { name: truffleruby, value: truffleruby-24.1.2 }
3131
openssl:
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
37+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -112,13 +112,16 @@ jobs:
112112
ruby:
113113
- { name: "3.1", value: 3.1.7 }
114114
- { name: "3.2", value: 3.2.8 }
115-
- { name: "3.3", value: 3.3.7 }
116-
- { name: "3.4", value: 3.4.2 }
117-
- { name: jruby-9.4, value: jruby-9.4.12.0, rails-args: "--skip-webpack-install" }
115+
- { name: "3.3", value: 3.3.8 }
116+
- { name: "3.4", value: 3.4.3 }
117+
- { name: jruby, value: jruby-9.4.12.0, rails-args: "--skip-webpack-install" }
118118
steps:
119119
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
120+
# TODO:
121+
# * Go back to ruby/setup-ruby once https://github.com/ruby/setup-ruby/pull/762 is released
122+
# * Figure out regression in gcc packages, my fork is pinned to https://github.com/ntkme/setup-msys2-gcc/releases/tag/v20250509.003447 because newer releases break our tests for some reason
120123
- name: Setup ruby
121-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
124+
uses: deivid-rodriguez/setup-ruby@dev
122125
with:
123126
ruby-version: ${{ matrix.ruby.value }}
124127
bundler: none
@@ -140,7 +143,7 @@ jobs:
140143
- name: Generate a Rails application
141144
run: gem install rails --version 8.0.1 && rails new foo ${{ matrix.ruby.rails-args }}
142145
shell: bash
143-
if: matrix.ruby.name != 'jruby-9.4' && matrix.ruby.name != '3.1'
146+
if: matrix.ruby.name != 'jruby' && matrix.ruby.name != '3.1'
144147
- name: Use gem installed in a bin dir different from where Ruby itself is installed
145148
run: gem install rspec --version 3.13.0 --install-dir foo && GEM_HOME=foo foo/bin/rspec --version
146149
shell: bash
@@ -158,7 +161,7 @@ jobs:
158161
steps:
159162
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
160163
- name: Setup original ruby
161-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
164+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
162165
with:
163166
ruby-version: 3.2
164167
bundler: none
@@ -179,7 +182,7 @@ jobs:
179182
GEM_HOME: bar
180183
GEM_PATH: bar
181184
- name: Setup final ruby
182-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
185+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
183186
with:
184187
ruby-version: 3.3
185188
bundler: none

‎.github/workflows/read-only.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
ruby:
2929
- { name: ruby-3.1, value: 3.1.7 }
3030
- { name: ruby-3.2, value: 3.2.8 }
31-
- { name: ruby-3.3, value: 3.3.7 }
32-
- { name: ruby-3.4, value: 3.4.2 }
31+
- { name: ruby-3.3, value: 3.3.8 }
32+
- { name: ruby-3.4, value: 3.4.3 }
3333

3434
steps:
3535
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ jobs:
2727
ruby:
2828
- { name: ruby-3.1, value: 3.1.7 }
2929
- { name: ruby-3.2, value: 3.2.8 }
30-
- { name: ruby-3.3, value: 3.3.7 }
31-
- { name: ruby-3.4, value: 3.4.2 }
30+
- { name: ruby-3.3, value: 3.3.8 }
31+
- { name: ruby-3.4, value: 3.4.3 }
3232

3333
bundler:
3434
- { name: 2, value: '' }
@@ -37,15 +37,15 @@ jobs:
3737
include:
3838
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 } }
3939
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 } }
40-
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 } }
41-
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 } }
40+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.8 } }
41+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.3 } }
4242
env:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
4545
steps:
4646
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4747
- name: Setup ruby
48-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
48+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
@@ -69,9 +69,9 @@ jobs:
6969
steps:
7070
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7171
- name: Setup ruby
72-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
72+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
7373
with:
74-
ruby-version: 3.4.2
74+
ruby-version: 3.4.3
7575
bundler: none
7676
- name: Prepare tapioca
7777
run: ruby ../../../support/bundle.rb install
@@ -90,16 +90,16 @@ jobs:
9090
include:
9191
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 } }
9292
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 } }
93-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 } }
94-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 } }
93+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.8 } }
94+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.3 } }
9595
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.7 } }
9696
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.8 } }
97-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.7 } }
98-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.2 } }
97+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.8 } }
98+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.3 } }
9999
steps:
100100
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
101101
- name: Setup ruby
102-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
102+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
103103
with:
104104
ruby-version: ${{ matrix.ruby.value }}
105105
bundler: none
@@ -124,14 +124,14 @@ jobs:
124124
steps:
125125
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126126
- name: Setup ruby
127-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
127+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
128128
with:
129-
ruby-version: 3.4.2
129+
ruby-version: 3.4.3
130130
bundler: none
131131
- name: Prepare dependencies
132132
run: bin/rake setup
133133
- name: Download all used cassettes as artifacts
134-
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
134+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
135135
with:
136136
path: ./bundler/spec/support/artifice/used_vcr_cassettes
137137
- name: Check unused cassettes

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
repository: ruby/ruby
2929
path: ruby/ruby
30-
ref: v3_4_2
30+
ref: v3_4_3
3131
- name: Install libraries
3232
run: |
3333
set -x

‎.github/workflows/rubygems.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
ruby:
3030
- { name: "3.1", value: 3.1.7 }
3131
- { name: "3.2", value: 3.2.8 }
32-
- { name: "3.3", value: 3.3.7 }
33-
- { name: "3.4", value: 3.4.2 }
32+
- { name: "3.3", value: 3.3.8 }
33+
- { name: "3.4", value: 3.4.3 }
3434

3535
include:
3636
- ruby: { name: jruby, value: jruby-9.4.12.0 }
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4444
- name: Setup ruby
45-
uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
45+
uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
4646
with:
4747
ruby-version: ${{ matrix.ruby.value }}
4848
bundler: none

‎.github/workflows/scorecards.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
52+
uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
5353
with:
5454
sarif_file: results.sarif

‎.github/workflows/spell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ jobs:
1616
runs-on: ubuntu-24.04
1717
steps:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
19-
- uses: actions/setup-python@8d9ed9ac5c53483de85588cdf95a591a75ab9f55 # v5.5.0
19+
- uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
2020
- run: pip install -r .github/workflows/spell.txt
2121
- run: codespell

0 commit comments

Comments
 (0)