Skip to content

Commit 00a344e

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #8333 from rubygems/release/bundler_2.6.1_rubygems_3.6.1
Prepare RubyGems 3.6.1 and Bundler 2.6.1
2 parents d6be031 + bdc7bda commit 00a344e

37 files changed

+266
-103
lines changed

‎.github/workflows/bundler.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- { name: ruby-3.1, value: 3.1.6 }
3333
- { name: ruby-3.2, value: 3.2.6 }
3434
- { name: ruby-3.3, value: 3.3.6 }
35-
- { name: ruby-3.4, value: 3.4.0-preview2 }
35+
- { name: ruby-3.4, value: 3.4.0-rc1 }
3636

3737
bundler:
3838
- { name: 2, value: '' }
@@ -42,7 +42,7 @@ jobs:
4242
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 90 }
4343
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 90 }
4444
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 }, timeout: 90 }
45-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 }, timeout: 90 }
4646

4747
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 }, timeout: 150 }
4848
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 }, timeout: 150 }
@@ -54,7 +54,7 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5656
- name: Setup ruby
57-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
57+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
5858
with:
5959
ruby-version: ${{ matrix.ruby.value }}
6060
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@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
25+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.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@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
29+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
3030
with:
3131
ruby-version: ${{ matrix.ruby }}
3232
bundler: none

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- { name: "3.1", value: 3.1.6 }
2626
- { name: "3.2", value: 3.2.6 }
2727
- { name: "3.3", value: 3.3.6 }
28-
- { name: "3.4", value: 3.4.0-preview2 }
28+
- { name: "3.4", value: 3.4.0-rc1 }
2929
- { name: jruby, value: jruby-9.4.9.0 }
3030
- { name: truffleruby, value: truffleruby-24.0.1 }
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@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
37+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -113,7 +113,7 @@ jobs:
113113
steps:
114114
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
115115
- name: Setup ruby
116-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
116+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
117117
with:
118118
ruby-version: ${{ matrix.ruby.value }}
119119
bundler: none
@@ -152,7 +152,7 @@ jobs:
152152
steps:
153153
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
154154
- name: Setup original ruby
155-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
155+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
156156
with:
157157
ruby-version: 3.2
158158
bundler: none
@@ -173,7 +173,7 @@ jobs:
173173
GEM_HOME: bar
174174
GEM_PATH: bar
175175
- name: Setup final ruby
176-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
176+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
177177
with:
178178
ruby-version: 3.3
179179
bundler: none

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
- name: Setup ruby
39-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
39+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
4040
with:
4141
ruby-version: jruby-9.4.9.0
4242
bundler: none

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- { name: ruby-3.1, value: 3.1.6 }
2929
- { name: ruby-3.2, value: 3.2.6 }
3030
- { name: ruby-3.3, value: 3.3.6 }
31-
- { name: ruby-3.4, value: 3.4.0-preview2 }
31+
- { name: ruby-3.4, value: 3.4.0-rc1 }
3232

3333
bundler:
3434
- { name: 2, value: '' }
@@ -38,14 +38,14 @@ jobs:
3838
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
3939
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
4040
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
41-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
41+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
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@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
48+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
@@ -73,15 +73,15 @@ jobs:
7373
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7474
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7575
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
76-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
76+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
7777
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7878
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7979
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.6 } }
80-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
80+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
8181
steps:
8282
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
8383
- name: Setup ruby
84-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
84+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
8585
with:
8686
ruby-version: ${{ matrix.ruby.value }}
8787
bundler: none
@@ -106,9 +106,9 @@ jobs:
106106
steps:
107107
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
108108
- name: Setup ruby
109-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
109+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
110110
with:
111-
ruby-version: 3.4.0-preview2
111+
ruby-version: 3.4.0-rc1
112112
bundler: none
113113
- name: Prepare dependencies
114114
run: bin/rake setup

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
target: [Rubygems, Bundler]
2525
steps:
2626
- name: Set up latest ruby head
27-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
27+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
2828
with:
2929
ruby-version: head
3030
bundler: none

‎.github/workflows/rubygems.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ jobs:
3838
- ruby: { name: truffleruby, value: truffleruby-24.0.1 }
3939
os: { name: Ubuntu, value: ubuntu-24.04 }
4040

41-
- ruby: { name: "3.4", value: 3.4.0-preview2 }
41+
- ruby: { name: "3.4", value: 3.4.0-rc1 }
4242
os: { name: Ubuntu, value: ubuntu-24.04 }
4343

44-
- ruby: { name: "3.4", value: 3.4.0-preview2 }
44+
- ruby: { name: "3.4", value: 3.4.0-rc1 }
4545
os: { name: macOS, value: macos-14 }
4646

4747
steps:
4848
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4949
- name: Setup ruby
50-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
50+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
5151
with:
5252
ruby-version: ${{ matrix.ruby.value }}
5353
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@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
52+
uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
5353
with:
5454
sarif_file: results.sarif

‎.github/workflows/system-rubygems-bundler.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ jobs:
2929
fail-fast: false
3030
matrix:
3131
include:
32-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
33-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
34-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 } }
35-
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
36-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
37-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
38-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.6 } }
39-
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-preview2 } }
32+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.0 } }
33+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.0 } }
34+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 } }
35+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
36+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.0 } }
37+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.0 } }
38+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0 } }
39+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.0-rc1 } }
4040
steps:
4141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4242
- name: Setup ruby
43-
uses: ruby/setup-ruby@2a18b06812b0e15bb916e1df298d3e740422c47e # v1.203.0
43+
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
4444
with:
4545
ruby-version: ${{ matrix.ruby.value }}
4646
bundler: none

0 commit comments

Comments
 (0)