Skip to content

Commit 2a353e4

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #8632 from rubygems/release/bundler_2.6.8_rubygems_3.6.8
Prepare RubyGems 3.6.8 and Bundler 2.6.8
2 parents 32896b3 + d30c92f commit 2a353e4

Some content is hidden

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

47 files changed

+448
-259
lines changed

‎.codeclimate.yml‎

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

‎.github/ISSUE_TEMPLATE/bundler-related-issue.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,11 @@ Ideally, we recommend you set up the list of steps as a Dockerfile. A Dockerfile
5959

6060
<!-- Replace this with the results you expected before running the command. -->
6161

62-
### What actually happened?
62+
### What happened instead?
6363

64-
<!-- Replace this with the actual result you got. Paste the output of your command here. -->
64+
````
65+
Replace this with the actual result you got. Paste the output of your command here.
66+
````
6567

6668
### If not included with the output of your command, run `bundle env` and paste the output below
6769

‎.github/workflows/bundler.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ jobs:
3939
- { name: 3, value: 3.0.0 }
4040

4141
include:
42-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 90 }
43-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 }, timeout: 90 }
44-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 90 }
45-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 }, timeout: 90 }
42+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 90 }
43+
- { 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 }
4646

47-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 150 }
48-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 }, timeout: 150 }
49-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 }, timeout: 150 }
50-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 }, timeout: 150 }
47+
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 }, timeout: 150 }
48+
- { 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 }
5151

5252
- { os: { name: Ubuntu, value: ubuntu-24.04 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
53-
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
53+
- { os: { name: Windows, value: windows-2025 }, bundler: { name: 2, value: '' }, ruby: { name: jruby, value: jruby-9.4.12.0 } }
5454

5555
env:
5656
RGV: ..
@@ -76,7 +76,7 @@ jobs:
7676
if: matrix.bundler.value != ''
7777
- name: Prepare dependencies
7878
run: |
79-
bin/rake spec:parallel_deps
79+
bin/rake dev:deps
8080
- name: Run Test (CRuby)
8181
run: |
8282
bin/parallel_rspec

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- name: Prepare dependencies
3434
run: |
3535
sudo apt-get install graphviz -y
36-
bin/rake spec:parallel_deps
36+
bin/rake dev:deps
3737
3838
- name: Run Test
3939
run: |

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
os: [ ubuntu-24.04 ]
2020
ruby: [ ruby-head, truffleruby-head ]
2121
include:
22-
- { os: windows-2022, ruby: mswin }
22+
- { os: windows-2025, ruby: mswin }
2323
env:
2424
TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
2525
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105

106106
install_rubygems_windows:
107107
name: Install Rubygems on Windows (${{ matrix.ruby.name }})
108-
runs-on: windows-2022
108+
runs-on: windows-2025
109109
strategy:
110110
fail-fast: false
111111
matrix:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ jobs:
3535
- { name: 3, value: 3.0.0 }
3636

3737
include:
38-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 } }
39-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.8 } }
40-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.7 } }
41-
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.4, value: 3.4.2 } }
38+
- { os: { name: macOS, value: macos-15 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.7 } }
39+
- { 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 } }
4242
env:
4343
RGV: ..
4444
RUBYOPT: --disable-gems
@@ -53,7 +53,7 @@ jobs:
5353
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
5454
if: matrix.bundler.value != ''
5555
- name: Prepare dependencies
56-
run: bin/rake spec:deps
56+
run: bin/rake dev:deps
5757
- name: Run Test
5858
run: bin/rake spec:realworld
5959
- name: Upload used cassettes as artifact
@@ -107,7 +107,7 @@ jobs:
107107
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
108108
if: matrix.bundler.value != ''
109109
- name: Prepare dependencies
110-
run: bin/rake spec:deps
110+
run: bin/rake dev:deps
111111
- name: Run Test
112112
run: bin/rake spec:realworld
113113
- name: Upload used cassettes as artifact

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
- name: Sync tools
4646
run: |
4747
ruby tool/sync_default_gems.rb rubygems
48+
mv spec/bundler/bin/parallel_rspec spec/bin/parallel_rspec # TODO: fix `sync_default_gems.rb` script so we don't need to vendor the ruby-core binstub ourselves
4849
working-directory: ruby/ruby
4950
- name: Test RubyGems
5051
run: make -j2 -s test-all TESTS="rubygems --no-retry"

‎.github/workflows/rubygems.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
matrix:
2424
os:
2525
- { name: Ubuntu, value: ubuntu-24.04 }
26-
- { name: macOS, value: macos-14 }
27-
- { name: Windows, value: windows-2022 }
26+
- { name: macOS, value: macos-15 }
27+
- { name: Windows, value: windows-2025 }
2828

2929
ruby:
3030
- { name: "3.1", value: 3.1.7 }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
if: matrix.bundler.value != ''
5353
- name: Prepare dependencies
5454
run: |
55-
bin/rake spec:parallel_deps
55+
bin/rake dev:deps
5656
- name: Run Test
5757
run: |
5858
bin/parallel_rspec

0 commit comments

Comments
 (0)