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
rubygems · Dec 17, 2020 · d85cd5b · d85cd5b
2 parents 2537856 + edf744e
commit d85cd5b
Show file tree

Hide file tree

Showing 35 changed files with 345 additions and 100 deletions.
diff --git a/.changelog.yml b/.changelog.yml
@@ -4,7 +4,7 @@ header_template: "=== %new_version / %release_date"
 
 entry_template: "* %pull_request_title. Pull request #%pull_request_number by %pull_request_author"
 
-release_date_format: "%Y-%m-%-d"
+release_date_format: "%Y-%m-%d"
 
 entry_wrapping: 74
 

diff --git a/.github/workflows/daily-bundler.yml b/.github/workflows/daily-bundler.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   daily_bundler:
+    name: Bundler (ruby-head)
     runs-on: ubuntu-18.04
     if: github.repository == 'rubygems/rubygems'
     env:

diff --git a/.github/workflows/daily-rubygems.yml b/.github/workflows/daily-rubygems.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   daily_rubygems:
+    name: Rubygems (ruby-head)
     runs-on: ubuntu-18.04
     if: github.repository == 'rubygems/rubygems'
     strategy:

diff --git a/.github/workflows/install-rubygems.yml b/.github/workflows/install-rubygems.yml
@@ -10,18 +10,27 @@ on:
 
 jobs:
   install_rubygems_ubuntu:
+    name: Install Rubygems on Ubuntu (${{ matrix.ruby.name }}, ${{ matrix.openssl.name }})
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2, jruby-9.2.11.1 ]
-        openssl: [true, false]
+        ruby:
+          - { name: 2.3, value: 2.3.8 }
+          - { name: 2.4, value: 2.4.10 }
+          - { name: 2.5, value: 2.5.8 }
+          - { name: 2.6, value: 2.6.6 }
+          - { name: 2.7, value: 2.7.2 }
+          - { name: jruby-9.2, value: jruby-9.2.14.0 }
+        openssl:
+          - { name: "openssl", value: true }
+          - { name: "no-openssl", value: false }
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install rubygems
         run: ruby -Ilib -S rake install 2> errors.txt
@@ -31,13 +40,13 @@ jobs:
         run: gem list bundler
         env:
           RUBYOPT: -Itest/rubygems/fake_certlib
-        if: matrix.openssl == false
+        if: matrix.openssl.value == false
       - name: Run a local rubygems command
         run: gem list bundler
-        if: matrix.openssl == true
+        if: matrix.openssl.value == true
       - name: Run a remote rubygems command
         run: gem outdated
-        if: matrix.openssl == true
+        if: matrix.openssl.value == true
       - name: Run bundler installed as a default gem
         run: bundle --version
       - name: Check bundler man pages were installed and are properly picked up
@@ -56,6 +65,7 @@ jobs:
     timeout-minutes: 10
 
   install_rubygems_windows:
+    name: Install Rubygems on Windows
     runs-on: windows-2019
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/jruby-bundler.yml b/.github/workflows/jruby-bundler.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   jruby_bundler:
+    name: Bundler (JRuby)
     runs-on: ubuntu-18.04
 
     env:
@@ -20,7 +21,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: jruby-9.2.11.1
+          ruby-version: jruby-9.2.14.0
           bundler: none
       - name: Prepare dependencies
         run: |

diff --git a/.github/workflows/macos-rubygems.yml b/.github/workflows/macos-rubygems.yml
@@ -10,17 +10,22 @@ on:
 
 jobs:
   macos_rubygems:
+    name: Rubygems on MacOS (${{ matrix.ruby.name }})
     runs-on: macos-10.15
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
+        ruby:
+          - { name: 2.4, value: 2.4.10 }
+          - { name: 2.5, value: 2.5.8 }
+          - { name: 2.6, value: 2.6.6 }
+          - { name: 2.7, value: 2.7.2 }
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install Dependencies
         run: rake setup

diff --git a/.github/workflows/older-rubygems-bundler.yml b/.github/workflows/older-rubygems-bundler.yml
@@ -14,31 +14,46 @@ on:
 
 jobs:
   older_rubygems_bundler:
+    name: Bundler ${{ matrix.bundler.name }} against old Rubygems (${{ matrix.ruby.name }}, ${{ matrix.rgv.name}})
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
-        rgv: [ v2.5.2, v2.6.14, v2.7.10, v3.0.8, v3.1.4 ]
-        bundler: [ '' ]
+        ruby:
+          - { name: ruby-2.3, value: 2.3.8 }
+          - { name: ruby-2.4, value: 2.4.10 }
+          - { name: ruby-2.5, value: 2.5.8 }
+          - { name: ruby-2.6, value: 2.6.6 }
+          - { name: ruby-2.7, value: 2.7.2 }
+        rgv:
+          - { name: rgv-2.5, value: v2.5.2 }
+          - { name: rgv-2.6, value: v2.6.14 }
+          - { name: rgv-2.7, value: v2.7.10 }
+          - { name: rgv-3.0, value: v3.0.8 }
+          - { name: rgv-3.1, value: v3.1.4 }
+
+        bundler:
+          - { name: 2, value: '' }
+
         exclude:
-          - { bundler: '', ruby: 2.4.10, rgv: v2.5.2  }
-          - { bundler: '', ruby: 2.5.8, rgv: v2.5.2  }
-          - { bundler: '', ruby: 2.5.8, rgv: v2.6.14 }
-          - { bundler: '', ruby: 2.6.6, rgv: v2.5.2  }
-          - { bundler: '', ruby: 2.6.6, rgv: v2.6.14 }
-          - { bundler: '', ruby: 2.6.6, rgv: v2.7.10 }
-          - { bundler: '', ruby: 2.7.2, rgv: v2.5.2  }
-          - { bundler: '', ruby: 2.7.2, rgv: v2.6.14 }
-          - { bundler: '', ruby: 2.7.2, rgv: v2.7.10 }
-          - { bundler: '', ruby: 2.7.2, rgv: v3.0.8  }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.4, value: 2.4.10 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.5, value: 2.5.8 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.6 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.5, value: v2.5.2 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.6, value: v2.6.14 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-2.7, value: v2.7.10 } }
+          - { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.2 }, rgv: { name: rgv-3.0, value: v3.0.8 } }
+
         include:
-          - { bundler: 3.0.0, ruby: 2.4.10, rgv: v3.1.4 }
-          - { bundler: 3.0.0, ruby: 2.5.8, rgv: v3.1.4 }
-          - { bundler: 3.0.0, ruby: 2.6.6, rgv: v3.1.4 }
-          - { bundler: 3.0.0, ruby: 2.7.2, rgv: v3.1.4 }
+          - { 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 } }
+          - { 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 } }
+          - { 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 } }
+          - { 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 } }
     env:
-      RGV: ${{ matrix.rgv }}
+      RGV: ${{ matrix.rgv.value }}
       RUBYOPT: --disable-gems
     steps:
       - uses: actions/checkout@v2
@@ -47,14 +62,14 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install graphviz
         run: sudo apt-get install graphviz -y
-        if: matrix.bundler == ''
+        if: matrix.bundler.value == ''
       - name: Replace version
-        run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler }} bin/rake override_version
-        if: matrix.bundler != ''
+        run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
+        if: matrix.bundler.value != ''
         working-directory: ./bundler
       - name: Prepare dependencies
         run: |

diff --git a/.github/workflows/ruby-core.yml b/.github/workflows/ruby-core.yml
@@ -10,11 +10,12 @@ on:
 
 jobs:
   ruby_core:
+    name: ${{matrix.target}} under a ruby-core setup
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        target: [rubygems, bundler]
+        target: [Rubygems, Bundler]
     steps:
       - name: Set up latest ruby head
         uses: ruby/setup-ruby@v1
@@ -50,12 +51,12 @@ jobs:
           ruby tool/sync_default_gems.rb rubygems
           make test-all TESTS="rubygems -j2"
         working-directory: ruby/ruby
-        if: matrix.target == 'rubygems'
+        if: matrix.target == 'Rubygems'
       - name: Test Bundler
         run: |
           ruby tool/sync_default_gems.rb bundler
           git checkout lib/bundler/bundler.gemspec
           git add .
           make test-bundler-parallel
         working-directory: ruby/ruby
-        if: matrix.target == 'bundler'
+        if: matrix.target == 'Bundler'
diff --git a/.github/workflows/ubuntu-bundler.yml b/.github/workflows/ubuntu-bundler.yml
@@ -10,14 +10,24 @@ on:
 
 jobs:
   ubuntu_bundler:
+    name: Bundler ${{ matrix.bundler.name }} (${{ matrix.ruby.name }})
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
-        bundler: [ '', 3.0.0 ]
+        ruby:
+          - { name: ruby-2.3, value: 2.3.8 }
+          - { name: ruby-2.4, value: 2.4.10 }
+          - { name: ruby-2.5, value: 2.5.8 }
+          - { name: ruby-2.6, value: 2.6.6 }
+          - { name: ruby-2.7, value: 2.7.2 }
+
+        bundler:
+          - { name: 2, value: '' }
+          - { name: 3, value: 3.0.0 }
+
         exclude:
-          - { bundler: 3.0.0, ruby: 2.3.8 }
+          - { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.3, value: 2.3.8 } }
     env:
       RGV: ..
       RUBYOPT: --disable-gems
@@ -26,14 +36,14 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install graphviz
         run: sudo apt-get install graphviz -y
-        if: matrix.bundler == ''
+        if: matrix.bundler.value == ''
       - name: Replace version
-        run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler }} bin/rake override_version
-        if: matrix.bundler != ''
+        run: BUNDLER_SPEC_SUB_VERSION=${{ matrix.bundler.value }} bin/rake override_version
+        if: matrix.bundler.value != ''
         working-directory: ./bundler
       - name: Prepare dependencies
         run: |

diff --git a/.github/workflows/ubuntu-lint.yml b/.github/workflows/ubuntu-lint.yml
@@ -10,6 +10,7 @@ on:
 
 jobs:
   ubuntu_lint:
+    name: Lint
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/ubuntu-rubygems.yml b/.github/workflows/ubuntu-rubygems.yml
@@ -10,19 +10,27 @@ on:
 
 jobs:
   ubuntu_rubygems:
+    name: Rubygems on Ubuntu (${{ matrix.ruby.name }})
     runs-on: ubuntu-18.04
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.3.8, 2.4.10, 2.5.8, 2.6.6, 2.7.2, jruby-9.2.11.1, truffleruby-20.2.0 ]
+        ruby:
+          - { name: 2.3, value: 2.3.8 }
+          - { name: 2.4, value: 2.4.10 }
+          - { name: 2.5, value: 2.5.8 }
+          - { name: 2.6, value: 2.6.6 }
+          - { name: 2.7, value: 2.7.2 }
+          - { name: jruby-9.2, value: jruby-9.2.14.0 }
+          - { name: truffleruby-20.2, value: truffleruby-20.2.0 }
     env:
       TRUFFLERUBYOPT: "--experimental-options --testing-rubygems"
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install Dependencies
         run: rake setup

diff --git a/.github/workflows/windows-bundler.yml b/.github/workflows/windows-bundler.yml
@@ -10,6 +10,8 @@ on:
 
 jobs:
   windows_bundler:
+    name: Bundler on Windows (${{ matrix.ruby.name }})
+
     runs-on: windows-2019
 
     env:
@@ -18,14 +20,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 'jruby-9.2.11.1', '2.4', '2.5', '2.6', '2.7' ]
+        ruby:
+          - { name: jruby-9.2, value: jruby-9.2.14.0 }
+          - { name: ruby-2.4, value: 2.4.10 }
+          - { name: ruby-2.5, value: 2.5.8 }
+          - { name: ruby-2.6, value: 2.6.6 }
+          - { name: ruby-2.7, value: 2.7.2 }
 
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install dependencies
         run: |
@@ -37,4 +44,4 @@ jobs:
           bin/parallel_rspec
         working-directory: ./bundler
         shell: bash
-        if: "!startsWith(matrix.ruby, 'jruby')"
+        if: "!startsWith(matrix.ruby.name, 'jruby')"
diff --git a/.github/workflows/windows-rubygems.yml b/.github/workflows/windows-rubygems.yml
@@ -10,17 +10,22 @@ on:
 
 jobs:
   windows_rubygems:
+    name: Rubygems on Windows (${{ matrix.ruby.name }})
     runs-on: windows-2019
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.4.10, 2.5.8, 2.6.6, 2.7.2 ]
+        ruby:
+          - { name: 2.4, value: 2.4.10 }
+          - { name: 2.5, value: 2.5.8 }
+          - { name: 2.6, value: 2.6.6 }
+          - { name: 2.7, value: 2.7.2 }
     steps:
       - uses: actions/checkout@v2
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
+          ruby-version: ${{ matrix.ruby.value }}
           bundler: none
       - name: Install Dependencies
         run: rake setup