Merge pull request #74 from ruby/use-matrix-for-multiarch

Use matrix build for manifest
ruby · Feb 7, 2024 · 1fc3021 · 1fc3021
2 parents d10d019 + 13f28e4
commit 1fc3021
Showing 1 changed file with 9 additions and 14 deletions.
diff --git a/.github/workflows/build_multiarch.yml b/.github/workflows/build_multiarch.yml
@@ -116,6 +116,11 @@ jobs:
     strategy:
       matrix:
         registry_name: [ rubylang, ghcr.io/ruby ]
+        include:
+          - latest_tag: true
+            image_version_suffix: ''
+          - latest_tag: false
+            image_version_suffix: '-dev'
 
     runs-on: ubuntu-latest
 
@@ -147,24 +152,14 @@ jobs:
              ubuntu_version="${{ env.ubuntu_version }}" \
              architectures="amd64 arm64" \
              manifest_suffix=${{ github.sha }} \
-             latest_tag=true
-        rake docker:manifest:create \
-             registry_name="${{ matrix.registry_name }}" \
-             ruby_version="${{ env.ruby_version }}" \
-             ubuntu_version="${{ env.ubuntu_version }}" \
-             architectures="amd64 arm64" \
-             image_version_suffix=-dev \
-             manifest_suffix=${{ github.sha }}
+             latest_tag=${{ matrix.latest_tag }} \
+             image_version_suffix=${{ matrix.image_version_suffix }}
 
     - name: Push manifest to ${{ matrix.registry_name }}
       run: |-
         rake docker:manifest:push \
              registry_name="${{ matrix.registry_name }}" \
              ruby_version="${{ env.ruby_version }}" \
              ubuntu_version="${{ env.ubuntu_version }}" \
-             latest_tag=true
-        rake docker:manifest:push \
-             registry_name="${{ matrix.registry_name }}" \
-             ruby_version="${{ env.ruby_version }}" \
-             ubuntu_version="${{ env.ubuntu_version }}" \
-             image_version_suffix=-dev
+             latest_tag=${{ matrix.latest_tag }} \
+             image_version_suffix=${{ matrix.image_version_suffix }}