Skip to content

Commit 6f7a774

Browse files
martinemdemartinemde
authored
Merge branch 'master' into auto-user-install-override
2 parents 71ab43b + c09c923 commit 6f7a774

File tree

140 files changed

+11171
-743
lines changed

Some content is hidden

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

140 files changed

+11171
-743
lines changed

‎.codespellrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
check-filenames=
33
check-hidden=
44
ignore-words=.codespellignore
5-
skip=*.pem,.git,man,vcr_cassettes,vendor
5+
skip=*.pem,.git,man,vcr_cassettes,vendor,net-http

‎.github/workflows/bundler.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- { name: ruby-3.0, value: 3.0.6 }
3333
- { name: ruby-3.1, value: 3.1.4 }
3434
- { name: ruby-3.2, value: 3.2.2 }
35+
- { name: ruby-3.3, value: 3.3.0-rc1 }
3536

3637
bundler:
3738
- { name: 2, value: '' }
@@ -41,6 +42,7 @@ jobs:
4142
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 90 }
4243
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 90 }
4344
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 }, timeout: 90 }
45+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 }, timeout: 90 }
4446

4547
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 150 }
4648
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 150 }
@@ -52,7 +54,7 @@ jobs:
5254
steps:
5355
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5456
- name: Setup ruby
55-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
57+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
5658
with:
5759
ruby-version: ${{ matrix.ruby.value }}
5860
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@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2323

2424
- name: Set up Ruby
25-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
25+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.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
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2828

2929
- name: Set up Ruby
30-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
30+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
3131
with:
3232
ruby-version: ${{ matrix.ruby }}
3333
bundler: none

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
- { name: "3.0", value: 3.0.6 }
2626
- { name: "3.1", value: 3.1.4 }
2727
- { name: "3.2", value: 3.2.2 }
28+
- { name: "3.3", value: 3.3.0-rc1 }
2829
- { name: jruby-9.4, value: jruby-9.4.2.0 }
2930
- { name: truffleruby-23, value: truffleruby-23.1.1 }
3031
openssl:
@@ -33,7 +34,7 @@ jobs:
3334
steps:
3435
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3536
- name: Setup ruby
36-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
37+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
3738
with:
3839
ruby-version: ${{ matrix.ruby.value }}
3940
bundler: none
@@ -101,7 +102,7 @@ jobs:
101102
steps:
102103
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
103104
- name: Setup ruby
104-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
105+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
105106
with:
106107
ruby-version: ${{ matrix.ruby.value }}
107108
bundler: none

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
3636
- name: Setup ruby
37-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
37+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
3838
with:
3939
ruby-version: jruby-9.4.2.0
4040
bundler: none

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- { name: ruby-3.0, value: 3.0.6 }
2929
- { name: ruby-3.1, value: 3.1.4 }
3030
- { name: ruby-3.2, value: 3.2.2 }
31+
- { name: ruby-3.3, value: 3.3.0-rc1 }
3132

3233
bundler:
3334
- { name: 2, value: '' }
@@ -37,13 +38,14 @@ jobs:
3738
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
3839
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
3940
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
41+
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 } }
4042
env:
4143
RGV: ..
4244
RUBYOPT: --disable-gems
4345
steps:
4446
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4547
- name: Setup ruby
46-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
48+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
4749
with:
4850
ruby-version: ${{ matrix.ruby.value }}
4951
bundler: none
@@ -71,13 +73,15 @@ jobs:
7173
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
7274
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
7375
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
76+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 } }
7477
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
7578
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
7679
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.2 } }
80+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 } }
7781
steps:
7882
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
7983
- name: Setup ruby
80-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
84+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
8185
with:
8286
ruby-version: ${{ matrix.ruby.value }}
8387
bundler: none
@@ -102,9 +106,9 @@ jobs:
102106
steps:
103107
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
104108
- name: Setup ruby
105-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
109+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
106110
with:
107-
ruby-version: 3.2.2
111+
ruby-version: 3.3.0-rc1
108112
bundler: none
109113
- name: Download all used cassettes as artifacts
110114
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2

‎.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@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
27+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
2828
with:
2929
ruby-version: head
3030
bundler: none

‎.github/workflows/rubygems.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ jobs:
3030
- { name: "3.0", value: 3.0.6 }
3131
- { name: "3.1", value: 3.1.4 }
3232
- { name: "3.2", value: 3.2.2 }
33+
- { name: "3.3", value: 3.3.0-rc1 }
3334

3435
include:
35-
- ruby: { name: "3.2", value: 3.2.2 }
36-
os: { name: macOS, value: macos-12 }
37-
3836
- ruby: { name: jruby-9.4, value: jruby-9.4.2.0 }
3937
os: { name: Ubuntu, value: ubuntu-22.04 }
4038

@@ -44,10 +42,14 @@ jobs:
4442
- os: { name: Windows, value: windows-2022 }
4543
ruby: { name: mswin, value: mswin }
4644

45+
exclude:
46+
- os: { name: Windows, value: windows-2022 }
47+
ruby: { name: "3.3", value: 3.3.0-rc1 }
48+
4749
steps:
4850
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4951
- name: Setup ruby (Ubuntu/macOS)
50-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
52+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
5153
with:
5254
ruby-version: ${{ matrix.ruby.value }}
5355
bundler: none
@@ -72,7 +74,7 @@ jobs:
7274
if: "!startsWith(matrix.ruby.name, 'truffleruby') && !startsWith(matrix.ruby.name, 'jruby')"
7375
- name: Run Test isolatedly
7476
run: rake test:isolated
75-
if: matrix.ruby.name == '3.2' && matrix.os.name != 'Windows'
77+
if: matrix.ruby.name == '3.3' && matrix.os.name != 'Windows'
7678
- name: Run Test (JRuby)
7779
run: JRUBY_OPTS=--debug rake test
7880
if: startsWith(matrix.ruby.name, 'jruby')

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ jobs:
3333
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
3434
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
3535
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
36+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 } }
3637
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
3738
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
3839
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.2 } }
40+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0-rc1 } }
3941
steps:
4042
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
4143
- name: Setup ruby
42-
uses: ruby/setup-ruby@8575951200e472d5f2d95c625da0c7bec8217c42 # v1.161.0
44+
uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # v1.162.0
4345
with:
4446
ruby-version: ${{ matrix.ruby.value }}
4547
bundler: none
@@ -64,8 +66,10 @@ jobs:
6466
with:
6567
path: bundler/tmp/rubygems
6668
ref: ${{ env.RGV }}
69+
if: matrix.ruby.name != 'ruby-3.3'
6770
- name: Run Rubygems Requirement tests against local bundler, to make sure bundler monkeypatches preserve the behaviour
6871
run: |
6972
ruby -I../../lib:lib:test test/rubygems/test_gem_requirement.rb
7073
working-directory: ./bundler/tmp/rubygems
74+
if: matrix.ruby.name != 'ruby-3.3'
7175
timeout-minutes: 60

0 commit comments

Comments
 (0)