Skip to content

Commit 3c7c4ff

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #8418 from rubygems/release/bundler_2.6.3_rubygems_3.6.3
Prepare RubyGems 3.6.3 and Bundler 2.6.3
2 parents 90ebd47 + 5bc31c4 commit 3c7c4ff

File tree

116 files changed

+716
-385
lines changed

Some content is hidden

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

116 files changed

+716
-385
lines changed

‎.github/workflows/bundler.yml‎

Lines changed: 4 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-rc1 }
35+
- { name: ruby-3.4, value: 3.4.1 }
3636

3737
bundler:
3838
- { name: 2, value: '' }
@@ -42,19 +42,20 @@ 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-rc1 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 }, 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 }
4949
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.6 }, timeout: 150 }
50+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 }, timeout: 150 }
5051

5152
env:
5253
RGV: ..
5354
RUBYOPT: --disable-gems
5455
steps:
5556
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5657
- name: Setup ruby
57-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
58+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
5859
with:
5960
ruby-version: ${{ matrix.ruby.value }}
6061
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@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
25+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.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@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
29+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
3030
with:
3131
ruby-version: ${{ matrix.ruby }}
3232
bundler: none

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

Lines changed: 9 additions & 7 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-rc1 }
28+
- { name: "3.4", value: 3.4.1 }
2929
- { name: jruby, value: jruby-9.4.9.0 }
3030
- { name: truffleruby, value: truffleruby-24.1.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@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
37+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
3838
with:
3939
ruby-version: ${{ matrix.ruby.value }}
4040
bundler: none
@@ -109,16 +109,17 @@ jobs:
109109
- { name: "3.1", value: 3.1.6 }
110110
- { name: "3.2", value: 3.2.6 }
111111
- { name: "3.3", value: 3.3.6 }
112+
- { name: "3.4", value: 3.4.1 }
112113
- { name: jruby-9.4, value: jruby-9.4.9.0, rails-args: "--skip-webpack-install" }
113114
steps:
114115
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
115116
- name: Setup ruby
116-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
117+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
117118
with:
118119
ruby-version: ${{ matrix.ruby.value }}
119120
bundler: none
120121
- name: Setup java
121-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
122+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
122123
with:
123124
distribution: temurin
124125
java-version: 19.0.2
@@ -133,8 +134,9 @@ jobs:
133134
run: bundle init && bundle add fileutils --git https://github.com/ruby/fileutils
134135
shell: bash
135136
- name: Generate a Rails application
136-
run: gem install rails --version 7.0.8 && rails new foo ${{ matrix.ruby.rails-args }}
137+
run: gem install rails --version 8.0.1 && rails new foo ${{ matrix.ruby.rails-args }}
137138
shell: bash
139+
if: matrix.ruby.name != 'jruby-9.4' && matrix.ruby.name != '3.1'
138140
- name: Use gem installed in a bin dir different from where Ruby itself is installed
139141
run: gem install rspec --version 3.13.0 --install-dir foo && GEM_HOME=foo foo/bin/rspec --version
140142
shell: bash
@@ -152,7 +154,7 @@ jobs:
152154
steps:
153155
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
154156
- name: Setup original ruby
155-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
157+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
156158
with:
157159
ruby-version: 3.2
158160
bundler: none
@@ -173,7 +175,7 @@ jobs:
173175
GEM_HOME: bar
174176
GEM_PATH: bar
175177
- name: Setup final ruby
176-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
178+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
177179
with:
178180
ruby-version: 3.3
179181
bundler: none

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
- name: Setup ruby
39-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
39+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
4040
with:
4141
ruby-version: jruby-9.4.9.0
4242
bundler: none
4343
- name: Setup java
44-
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
44+
uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
4545
with:
4646
distribution: temurin
4747
java-version: 19.0.2

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: read-only
2+
3+
on:
4+
pull_request:
5+
6+
push:
7+
branches:
8+
- master
9+
10+
concurrency:
11+
group: ci-${{ github.ref }}-${{ github.workflow }}
12+
cancel-in-progress: true
13+
14+
permissions: # added using https://github.com/step-security/secure-workflows
15+
contents: read
16+
17+
defaults:
18+
run:
19+
shell: bash
20+
21+
jobs:
22+
read-only:
23+
name: Bundler on read-only system (${{ matrix.ruby.name }})
24+
runs-on: ubuntu-24.04
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
ruby:
29+
- { name: ruby-3.1, value: 3.1.6 }
30+
- { name: ruby-3.2, value: 3.2.6 }
31+
- { name: ruby-3.3, value: 3.3.6 }
32+
- { name: ruby-3.4, value: 3.4.1 }
33+
34+
steps:
35+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
36+
- name: Basic usage on a read-only filesystem
37+
run: docker run --mount type=bind,source=.,target=/rubygems --rm --read-only ruby:${{ matrix.ruby.value }} ruby -I/rubygems/bundler/lib -r'bundler/inline' -e 'gemfile {}; puts :ok'
38+
39+
timeout-minutes: 15

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

Lines changed: 28 additions & 10 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-rc1 }
31+
- { name: ruby-3.4, value: 3.4.1 }
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-rc1 } }
41+
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 } }
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@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
48+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
4949
with:
5050
ruby-version: ${{ matrix.ruby.value }}
5151
bundler: none
@@ -57,12 +57,30 @@ jobs:
5757
- name: Run Test
5858
run: bin/rake spec:realworld
5959
- name: Upload used cassettes as artifact
60-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
60+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
6161
with:
6262
name: cassettes-bundler-${{ matrix.bundler.name }}-${{ matrix.os.value }}-${{ matrix.ruby.name }}
6363
path: ./bundler/spec/support/artifice/used_cassettes.txt
6464
timeout-minutes: 20
6565

66+
tapioca:
67+
name: Tapioca
68+
runs-on: ubuntu-24.04
69+
steps:
70+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
71+
- name: Setup ruby
72+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
73+
with:
74+
ruby-version: 3.4.1
75+
bundler: none
76+
- name: Prepare tapioca
77+
run: ruby ../../../support/bundle.rb install
78+
working-directory: bundler/spec/realworld/fixtures/tapioca
79+
- name: Run tapioca
80+
run: ruby ../../../support/bundle.rb exec tapioca init
81+
working-directory: bundler/spec/realworld/fixtures/tapioca
82+
timeout-minutes: 20
83+
6684
system_rubygems_bundler:
6785
name: Realworld Bundler ${{ matrix.bundler.name }} against system Rubygems (${{ matrix.ruby.name }})
6886
runs-on: ubuntu-24.04
@@ -73,15 +91,15 @@ jobs:
7391
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7492
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7593
- { 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-rc1 } }
94+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.1 } }
7795
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.6 } }
7896
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.6 } }
7997
- { 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-rc1 } }
98+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.4, value: 3.4.1 } }
8199
steps:
82100
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
83101
- name: Setup ruby
84-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
102+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
85103
with:
86104
ruby-version: ${{ matrix.ruby.value }}
87105
bundler: none
@@ -93,7 +111,7 @@ jobs:
93111
- name: Run Test
94112
run: bin/rake spec:realworld
95113
- name: Upload used cassettes as artifact
96-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
114+
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
97115
with:
98116
name: cassettes-system-rubygems-bundler-${{ matrix.bundler.name }}-${{ matrix.ruby.name }}
99117
path: ./bundler/spec/support/artifice/used_cassettes.txt
@@ -106,9 +124,9 @@ jobs:
106124
steps:
107125
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
108126
- name: Setup ruby
109-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
127+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
110128
with:
111-
ruby-version: 3.4.0-rc1
129+
ruby-version: 3.4.1
112130
bundler: none
113131
- name: Prepare dependencies
114132
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@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
27+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
2828
with:
2929
ruby-version: head
3030
bundler: none

‎.github/workflows/rubygems.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
- { name: "3.1", value: 3.1.6 }
3131
- { name: "3.2", value: 3.2.6 }
3232
- { name: "3.3", value: 3.3.6 }
33+
- { name: "3.4", value: 3.4.1 }
3334

3435
include:
3536
- ruby: { name: jruby, value: jruby-9.4.9.0 }
@@ -38,16 +39,10 @@ jobs:
3839
- ruby: { name: truffleruby, value: truffleruby-24.1.1 }
3940
os: { name: Ubuntu, value: ubuntu-24.04 }
4041

41-
- ruby: { name: "3.4", value: 3.4.0-rc1 }
42-
os: { name: Ubuntu, value: ubuntu-24.04 }
43-
44-
- ruby: { name: "3.4", value: 3.4.0-rc1 }
45-
os: { name: macOS, value: macos-14 }
46-
4742
steps:
4843
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4944
- name: Setup ruby
50-
uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # v1.204.0
45+
uses: ruby/setup-ruby@868b3f088412f139260f27f5b148179b9dd6b008 # v1.208.0
5146
with:
5247
ruby-version: ${{ matrix.ruby.value }}
5348
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@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
52+
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
5353
with:
5454
sarif_file: results.sarif

0 commit comments

Comments
 (0)