Skip to content

Commit d85cd5b

Browse files
deivid-rodriguezdeivid-rodriguez
authored
Merge pull request #4164 from rubygems/release/bundler_2.2.2_rubygems_3.2.2
Prepare rubygems 3.2.2 and bundler 2.2.2 releases
2 parents 2537856 + edf744e commit d85cd5b

35 files changed

+345
-100
lines changed

‎.changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ header_template: "=== %new_version / %release_date"
44

55
entry_template: "* %pull_request_title. Pull request #%pull_request_number by %pull_request_author"
66

7-
release_date_format: "%Y-%m-%-d"
7+
release_date_format: "%Y-%m-%d"
88

99
entry_wrapping: 74
1010

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
daily_bundler:
9+
name: Bundler (ruby-head)
910
runs-on: ubuntu-18.04
1011
if: github.repository == 'rubygems/rubygems'
1112
env:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66

77
jobs:
88
daily_rubygems:
9+
name: Rubygems (ruby-head)
910
runs-on: ubuntu-18.04
1011
if: github.repository == 'rubygems/rubygems'
1112
strategy:

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

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,27 @@ on:
1010

1111
jobs:
1212
install_rubygems_ubuntu:
13+
name: Install Rubygems on Ubuntu (${{ matrix.ruby.name }}, ${{ matrix.openssl.name }})
1314
runs-on: ubuntu-18.04
1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2, jruby-9.2.11.1 ]
18-
openssl: [true, false]
18+
ruby:
19+
- { name: 2.3, value: 2.3.8 }
20+
- { name: 2.4, value: 2.4.10 }
21+
- { name: 2.5, value: 2.5.8 }
22+
- { name: 2.6, value: 2.6.6 }
23+
- { name: 2.7, value: 2.7.2 }
24+
- { name: jruby-9.2, value: jruby-9.2.14.0 }
25+
openssl:
26+
- { name: "openssl", value: true }
27+
- { name: "no-openssl", value: false }
1928
steps:
2029
- uses: actions/checkout@v2
2130
- name: Setup ruby
2231
uses: ruby/setup-ruby@v1
2332
with:
24-
ruby-version: ${{ matrix.ruby }}
33+
ruby-version: ${{ matrix.ruby.value }}
2534
bundler: none
2635
- name: Install rubygems
2736
run: ruby -Ilib -S rake install 2> errors.txt
@@ -31,13 +40,13 @@ jobs:
3140
run: gem list bundler
3241
env:
3342
RUBYOPT: -Itest/rubygems/fake_certlib
34-
if: matrix.openssl == false
43+
if: matrix.openssl.value == false
3544
- name: Run a local rubygems command
3645
run: gem list bundler
37-
if: matrix.openssl == true
46+
if: matrix.openssl.value == true
3847
- name: Run a remote rubygems command
3948
run: gem outdated
40-
if: matrix.openssl == true
49+
if: matrix.openssl.value == true
4150
- name: Run bundler installed as a default gem
4251
run: bundle --version
4352
- name: Check bundler man pages were installed and are properly picked up
@@ -56,6 +65,7 @@ jobs:
5665
timeout-minutes: 10
5766

5867
install_rubygems_windows:
68+
name: Install Rubygems on Windows
5969
runs-on: windows-2019
6070
steps:
6171
- uses: actions/checkout@v2

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
jobs:
1212
jruby_bundler:
13+
name: Bundler (JRuby)
1314
runs-on: ubuntu-18.04
1415

1516
env:
@@ -20,7 +21,7 @@ jobs:
2021
- name: Setup ruby
2122
uses: ruby/setup-ruby@v1
2223
with:
23-
ruby-version: jruby-9.2.11.1
24+
ruby-version: jruby-9.2.14.0
2425
bundler: none
2526
- name: Prepare dependencies
2627
run: |

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,22 @@ on:
1010

1111
jobs:
1212
macos_rubygems:
13+
name: Rubygems on MacOS (${{ matrix.ruby.name }})
1314
runs-on: macos-10.15
1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
ruby: [ 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
18+
ruby:
19+
- { name: 2.4, value: 2.4.10 }
20+
- { name: 2.5, value: 2.5.8 }
21+
- { name: 2.6, value: 2.6.6 }
22+
- { name: 2.7, value: 2.7.2 }
1823
steps:
1924
- uses: actions/checkout@v2
2025
- name: Setup ruby
2126
uses: ruby/setup-ruby@v1
2227
with:
23-
ruby-version: ${{ matrix.ruby }}
28+
ruby-version: ${{ matrix.ruby.value }}
2429
bundler: none
2530
- name: Install Dependencies
2631
run: rake setup

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

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,46 @@ on:
1414

1515
jobs:
1616
older_rubygems_bundler:
17+
name: Bundler ${{ matrix.bundler.name }} against old Rubygems (${{ matrix.ruby.name }}, ${{ matrix.rgv.name}})
1718
runs-on: ubuntu-18.04
1819
strategy:
1920
fail-fast: false
2021
matrix:
21-
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
22-
rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.8, v3.1.4 ]
23-
bundler: [ '' ]
22+
ruby:
23+
- { name: ruby-2.3, value: 2.3.8 }
24+
- { name: ruby-2.4, value: 2.4.10 }
25+
- { name: ruby-2.5, value: 2.5.8 }
26+
- { name: ruby-2.6, value: 2.6.6 }
27+
- { name: ruby-2.7, value: 2.7.2 }
28+
rgv:
29+
- { name: rgv-2.5, value: v2.5.2 }
30+
- { name: rgv-2.6, value: v2.6.14 }
31+
- { name: rgv-2.7, value: v2.7.10 }
32+
- { name: rgv-3.0, value: v3.0.8 }
33+
- { name: rgv-3.1, value: v3.1.4 }
34+
35+
bundler:
36+
- { name: 2, value: '' }
37+
2438
exclude:
25-
- { bundler: '', ruby: 2.4.10, rgv: v2.5.2 }
26-
- { bundler: '', ruby: 2.5.8, rgv: v2.5.2 }
27-
- { bundler: '', ruby: 2.5.8, rgv: v2.6.14 }
28-
- { bundler: '', ruby: 2.6.6, rgv: v2.5.2 }
29-
- { bundler: '', ruby: 2.6.6, rgv: v2.6.14 }
30-
- { bundler: '', ruby: 2.6.6, rgv: v2.7.10 }
31-
- { bundler: '', ruby: 2.7.2, rgv: v2.5.2 }
32-
- { bundler: '', ruby: 2.7.2, rgv: v2.6.14 }
33-
- { bundler: '', ruby: 2.7.2, rgv: v2.7.10 }
34-
- { bundler: '', ruby: 2.7.2, rgv: v3.0.8 }
39+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
40+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
41+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
42+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
43+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
44+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
45+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
46+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
47+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
48+
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.0, value: v3.0.8 } }
49+
3550
include:
36-
- { bundler: 3.0.0, ruby: 2.4.10, rgv: v3.1.4 }
37-
- { bundler: 3.0.0, ruby: 2.5.8, rgv: v3.1.4 }
38-
- { bundler: 3.0.0, ruby: 2.6.6, rgv: v3.1.4 }
39-
- { bundler: 3.0.0, ruby: 2.7.2, rgv: v3.1.4 }
51+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
52+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
53+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
54+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.1, value: v3.1.4 } }
4055
env:
41-
RGV: ${{ matrix.rgv }}
56+
RGV: ${{ matrix.rgv.value }}
4257
RUBYOPT: --disable-gems
4358
steps:
4459
- uses: actions/checkout@v2
@@ -47,14 +62,14 @@ jobs:
4762
- name: Setup ruby
4863
uses: ruby/setup-ruby@v1
4964
with:
50-
ruby-version: ${{ matrix.ruby }}
65+
ruby-version: ${{ matrix.ruby.value }}
5166
bundler: none
5267
- name: Install graphviz
5368
run: sudo apt-get install graphviz -y
54-
if: matrix.bundler == ''
69+
if: matrix.bundler.value == ''
5570
- name: Replace version
56-
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler }} bin/rake override_version
57-
if: matrix.bundler != ''
71+
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
72+
if: matrix.bundler.value != ''
5873
working-directory: ./bundler
5974
- name: Prepare dependencies
6075
run: |

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ on:
1010

1111
jobs:
1212
ruby_core:
13+
name: ${{matrix.target}} under a ruby-core setup
1314
runs-on: ubuntu-18.04
1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
target: [rubygems, bundler]
18+
target: [Rubygems, Bundler]
1819
steps:
1920
- name: Set up latest ruby head
2021
uses: ruby/setup-ruby@v1
@@ -50,12 +51,12 @@ jobs:
5051
ruby tool/sync_default_gems.rb rubygems
5152
make test-all TESTS="rubygems -j2"
5253
working-directory: ruby/ruby
53-
if: matrix.target == 'rubygems'
54+
if: matrix.target == 'Rubygems'
5455
- name: Test Bundler
5556
run: |
5657
ruby tool/sync_default_gems.rb bundler
5758
git checkout lib/bundler/bundler.gemspec
5859
git add .
5960
make test-bundler-parallel
6061
working-directory: ruby/ruby
61-
if: matrix.target == 'bundler'
62+
if: matrix.target == 'Bundler'

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,24 @@ on:
1010

1111
jobs:
1212
ubuntu_bundler:
13+
name: Bundler ${{ matrix.bundler.name }} (${{ matrix.ruby.name }})
1314
runs-on: ubuntu-18.04
1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
18-
bundler: [ '', 3.0.0 ]
18+
ruby:
19+
- { name: ruby-2.3, value: 2.3.8 }
20+
- { name: ruby-2.4, value: 2.4.10 }
21+
- { name: ruby-2.5, value: 2.5.8 }
22+
- { name: ruby-2.6, value: 2.6.6 }
23+
- { name: ruby-2.7, value: 2.7.2 }
24+
25+
bundler:
26+
- { name: 2, value: '' }
27+
- { name: 3, value: 3.0.0 }
28+
1929
exclude:
20-
- { bundler: 3.0.0, ruby: 2.3.8 }
30+
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.3, value: 2.3.8 } }
2131
env:
2232
RGV: ..
2333
RUBYOPT: --disable-gems
@@ -26,14 +36,14 @@ jobs:
2636
- name: Setup ruby
2737
uses: ruby/setup-ruby@v1
2838
with:
29-
ruby-version: ${{ matrix.ruby }}
39+
ruby-version: ${{ matrix.ruby.value }}
3040
bundler: none
3141
- name: Install graphviz
3242
run: sudo apt-get install graphviz -y
33-
if: matrix.bundler == ''
43+
if: matrix.bundler.value == ''
3444
- name: Replace version
35-
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler }} bin/rake override_version
36-
if: matrix.bundler != ''
45+
run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
46+
if: matrix.bundler.value != ''
3747
working-directory: ./bundler
3848
- name: Prepare dependencies
3949
run: |

‎.github/workflows/ubuntu-lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010

1111
jobs:
1212
ubuntu_lint:
13+
name: Lint
1314
runs-on: ubuntu-18.04
1415
steps:
1516
- uses: actions/checkout@v2

0 commit comments

Comments
 (0)