CI: Fix failing CI jobs

larskanis · Mar 29, 2024 · da56a92 · da56a92
1 parent 8d9035e
commit da56a92
Showing 1 changed file with 23 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -95,7 +95,7 @@ jobs:
     env:
       PLATFORM: ${{ matrix.platform }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -108,7 +108,7 @@ jobs:
           bundle exec rake gem:${PLATFORM}
 
       - name: Upload binary gem
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gem-${{ matrix.platform }}
           path: pkg/*-*-*.gem
@@ -157,15 +157,30 @@ jobs:
 
     runs-on: ${{ matrix.os }}-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - run: ruby --version
       - name: Download gem-${{matrix.platform}}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: gem-${{ matrix.platform }}
+      - name: Update rubygems - ruby-3.0
+        if: matrix.ruby == '3.0'
+        run: |
+          gem install --no-doc rubygems-update -v 3.5.7
+          update_rubygems
+      - name: Update rubygems - ruby-2.6 to 2.7
+        if: matrix.ruby == '2.6' || matrix.ruby == '2.7'
+        run: |
+          gem install --no-doc rubygems-update -v 3.4.22
+          update_rubygems
+      - name: Update rubygems - ruby-2.5
+        if: matrix.ruby == '2.5'
+        run: |
+          gem install --no-doc rubygems-update -v 3.3.27
+          update_rubygems
       - name: Install gem-${{matrix.platform}}
         run: gem install --local *.gem --verbose
       - name: Run tests
@@ -174,7 +189,7 @@ jobs:
           ruby -rffi -S rake test
 
   job_fat_binary_multiarch:
-    name: multiarch (${{matrix.platform}} on ${{matrix.from_image}})
+    name: multiarch (${{matrix.platform}} on ${{matrix.from_image}} ${{matrix.image_platform}})
     needs: rcd_build
     strategy:
       fail-fast: false
@@ -197,15 +212,15 @@ jobs:
             gem_platform: x86-linux-musl
             dockerfile: alpine
           - from_image: alpine
-            image_platform: linux/arm32v6
+            image_platform: linux/arm/v6
             gem_platform: arm-linux-musl
             dockerfile: alpine
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Download gem-${{matrix.gem_platform}}
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: gem-${{ matrix.gem_platform }}
       - name: Build image and Run tests