Integrate multiarch build with matrix

Author: hsbt

.github/workflows/build_multiarch.yml

@@ -21,10 +21,11 @@ env:
   GHCR_ACCESS_TOKEN: ${{ secrets.GHCR_ACCESS_TOKEN }}
 
 jobs:
-  build_amd64:
+  build:
     strategy:
       matrix:
         dev_suffix: [ '', '-dev' ]
+        arch: ['amd64', 'arm64']
 
     runs-on: ubuntu-latest
 
@@ -34,10 +35,10 @@ jobs:
       ubuntu_version: "${{ inputs.ubuntu_version || 'jammy' }}"
       ruby_version: "${{ inputs.ruby_version || 'master' }}"
       image_version_suffix: ''
-      tag_suffix: "-amd64-${{ github.sha }}"
+      tag_suffix: "-${{ matrix.arch }}-${{ github.sha }}"
       push_tags: |
-        ${{ inputs.ruby_version }}-${{ inputs.ubuntu_version }}-amd64-${{ github.sha }}
-        ${{ inputs.ruby_version }}-dev-${{ inputs.ubuntu_version }}-amd64-${{ github.sha }}
+        ${{ inputs.ruby_version }}-${{ inputs.ubuntu_version }}-${{ matrix.arch }}-${{ github.sha }}
+        ${{ inputs.ruby_version }}-dev-${{ inputs.ubuntu_version }}-${{ matrix.arch }}-${{ github.sha }}
       dev_suffix: ${{ matrix.dev_suffix }}
       optflags: ''
       cppflags: ''
@@ -64,65 +65,7 @@ jobs:
         tag_suffix: "${{ env.tag_suffix }}"
         latest_tag: ${{ env.latest_tag }}
         target: ${{ env.target }}
-
-    - uses: "./.github/actions/push_image"
-      if: "${{ env.push }}"
-      with:
-        ruby_version: "${{ env.ruby_version }}"
-        nightly: "${{ env.nightly }}"
-        image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}"
-        ubuntu_version: "${{ env.ubuntu_version }}"
-        tag_suffix: "${{ env.tag_suffix }}"
-
-    - uses: "./.github/actions/push_image_by_tag"
-      if: "${{ env.push_tags }}"
-      with:
-        push_tags: "${{ env.push_tags }}"
-
-  build_arm64:
-    strategy:
-      matrix:
-        dev_suffix: [ '', '-dev' ]
-
-    runs-on: ubuntu-latest
-
-    env:
-      nightly: false
-      push: false
-      ubuntu_version: "${{ inputs.ubuntu_version || 'jammy' }}"
-      ruby_version: "${{ inputs.ruby_version || 'master' }}"
-      image_version_suffix: ''
-      tag_suffix: "-arm64-${{ github.sha }}"
-      push_tags: |
-        ${{ inputs.ruby_version }}-${{ inputs.ubuntu_version }}-arm64-${{ github.sha }}
-        ${{ inputs.ruby_version }}-dev-${{ inputs.ubuntu_version }}-arm64-${{ github.sha }}
-      dev_suffix: ${{ matrix.dev_suffix }}
-      optflags: ''
-      cppflags: ''
-      debugflags: ''
-
-    steps:
-    - uses: actions/checkout@v4.1.0
-
-    - run: |
-        if [ "${{ env.dev_suffix }}" = "-dev" ]; then
-          echo "target=development" >> $GITHUB_ENV
-          echo "latest_tag=false" >> $GITHUB_ENV
-        else
-          echo "target=ruby" >> $GITHUB_ENV
-          echo "latest_tag=true" >> $GITHUB_ENV
-        fi
-
-    - uses: "./.github/actions/build_image"
-      with:
-        ruby_version: "${{ env.ruby_version }}"
-        nightly: "${{ env.nightly }}"
-        image_version_suffix: "${{ env.image_version_suffix }}${{ env.dev_suffix }}"
-        ubuntu_version: "${{ env.ubuntu_version }}"
-        tag_suffix: "${{ env.tag_suffix }}"
-        arch: 'linux/arm64'
-        latest_tag: ${{ env.latest_tag }}
-        target: ${{ env.target }}
+        arch: "linux/${{ matrix.arch }}"
 
     - uses: "./.github/actions/push_image"
       if: "${{ env.push }}"
@@ -145,9 +88,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    needs:
-    - build_amd64
-    - build_arm64
+    needs: build
 
     env:
       ruby_version: "${{ inputs.ruby_version }}"