@@ -1610,7 +1610,7 @@ jobs: |
1610 | 1610 | shell: bash |
1611 | 1611 | env: |
1612 | 1612 | BUNDLER_TEST_VERSION: ${{ matrix.bundler }} |
1613 | | - run: gem install bundler -v "$BUNDLER_TEST_VERSION" --no-document |
| 1613 | + run: scripts/gem-install-retry.sh bundler -v "$BUNDLER_TEST_VERSION" --no-document |
1614 | 1614 |
|
1615 | 1615 | # Installing a bundler does not make `bundle` run it: with no lockfile |
1616 | 1616 | # to read, RubyGems' binstub activates the HIGHEST installed bundler, |
@@ -2847,11 +2847,21 @@ jobs: |
2847 | 2847 | uses: ruby/setup-ruby@319994f95fa847cf3fb3cd3dbe89f6dcde9f178f # v1.295.0 |
2848 | 2848 | with: |
2849 | 2849 | ruby-version: '3.2.10' |
2850 | | - # The gem hosted rewrite pins into the Gemfile.lock CHECKSUMS |
2851 | | - # section, which `bundle lock --add-checksums` only emits on >= 2.6. |
2852 | | - bundler: '2.6' |
| 2850 | + # Bundler comes from the next step, which retries rubygems.org |
| 2851 | + # blips; setup-ruby's own install is a single bare `gem install`. |
| 2852 | + bundler: 'none' |
2853 | 2853 | bundler-cache: false |
2854 | 2854 |
|
| 2855 | + - name: Install Bundler |
| 2856 | + if: steps.gate.outputs.run == 'true' |
| 2857 | + # The gem hosted rewrite pins into the Gemfile.lock CHECKSUMS |
| 2858 | + # section, which `bundle lock --add-checksums` only emits on >= 2.6. |
| 2859 | + # `~> 2.6.0` is what setup-ruby's `bundler: '2.6'` installed; as the |
| 2860 | + # highest installed bundler it is the one `bundle` runs. |
| 2861 | + run: | |
| 2862 | + scripts/gem-install-retry.sh bundler -v '~> 2.6.0' --no-document |
| 2863 | + bundle --version |
| 2864 | +
|
2855 | 2865 | - name: Setup Go |
2856 | 2866 | if: steps.gate.outputs.run == 'true' |
2857 | 2867 | uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0 |
|