use arm runner to build arm64/v7/v6 docker image

2025-10-13 21:26:01 +08:00
parent 22061e535a
commit e90340fec4
6 changed files with 172 additions and 149 deletions
@@ -40,7 +40,7 @@ jobs:
          echo "ezbookkeeping_docker_bake_meta_file_path=${{ runner.temp }}/bake-meta.json" >> "$GITHUB_OUTPUT"
          echo "ezbookkeeping_docker_bake_meta_artifact_name=ezbookkeeping-build-release-docker-bake-meta-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
          echo "ezbookkeeping_docker_digests_file_path=${{ runner.temp }}/digests" >> "$GITHUB_OUTPUT"
-          echo "ezbookkeeping_docker_digests_artifact_name_prefix=ezbookkeeping-release-digests-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
+          echo "ezbookkeeping_docker_digests_artifact_name_prefix=ezbookkeeping-build-release-digests-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
          echo "ezbookkeeping_package_file_name_prefix=ezbookkeeping-${{ github.ref_name }}" >> "$GITHUB_OUTPUT"
          echo "ezbookkeeping_package_artifact_name_prefix=ezbookkeeping-build-release-package-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
          echo "ezbookkeeping_backend_artifact_name_prefix=ezbookkeeping-build-release-backend-${{ github.run_id }}" >> "$GITHUB_OUTPUT"
@@ -56,15 +56,39 @@ jobs:
          path: ${{ steps.variable.outputs.ezbookkeeping_docker_bake_meta_file_path }}
          if-no-files-found: error

-  build-linux-docker:
-    runs-on: ubuntu-latest
+  build-linux-docker-and-package-x86:
+    runs-on: ubuntu-24.04
+    needs:
+      - setup
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - uses: ./.github/actions/build-linux-docker-and-package
+        with:
+          release-build: 1
+          check-3rd-api: ${{ vars.CHECK_3RD_API }}
+          skip-tests: ${{ vars.SKIP_TESTS }}
+          platform: linux/amd64
+          platform-name: linux-amd64
+          docker-push: true
+          docker-image-name: ${{ vars.DOCKER_IMAGE_NAME }}
+          docker-username: ${{ vars.DOCKER_USERNAME }}
+          docker-password: ${{ secrets.DOCKER_PASSWORD }}
+          docker-bake-meta-file-path: ${{ needs.setup.outputs.ezbookkeeping-docker-bake-meta-file-path }}
+          docker-bake-meta-artifact-name: ${{ needs.setup.outputs.ezbookkeeping-docker-bake-meta-artifact-name }}
+          docker-bake-digests-file-path: ${{ needs.setup.outputs.ezbookkeeping-docker-digests-file-path }}
+          docker-bake-digests-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-docker-digests-artifact-name-prefix }}
+          package-file-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-file-name-prefix }}
+          package-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-artifact-name-prefix }}
+
+  build-linux-docker-and-package-arm:
+    runs-on: ubuntu-24.04-arm
    needs:
      - setup
    strategy:
      matrix:
        include:
-          - platform: linux/amd64
-            platform-name: linux-amd64
          - platform: linux/arm64/v8
            platform-name: linux-arm64
          - platform: linux/arm/v7
@@ -75,7 +99,7 @@ jobs:
      - name: Checkout
        uses: actions/checkout@v5

-      - uses: ./.github/actions/build-linux-docker
+      - uses: ./.github/actions/build-linux-docker-and-package
        with:
          release-build: 1
          check-3rd-api: ${{ vars.CHECK_3RD_API }}
@@ -90,11 +114,14 @@ jobs:
          docker-bake-meta-artifact-name: ${{ needs.setup.outputs.ezbookkeeping-docker-bake-meta-artifact-name }}
          docker-bake-digests-file-path: ${{ needs.setup.outputs.ezbookkeeping-docker-digests-file-path }}
          docker-bake-digests-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-docker-digests-artifact-name-prefix }}
+          package-file-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-file-name-prefix }}
+          package-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-artifact-name-prefix }}

  push-linux-docker:
    needs:
      - setup
-      - build-linux-docker
+      - build-linux-docker-and-package-x86
+      - build-linux-docker-and-package-arm
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@@ -111,37 +138,6 @@ jobs:
          docker-bake-digests-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-docker-digests-artifact-name-prefix }}
          docker-image-tags: ${{ needs.setup.outputs.docker-tags }}

-  upload-linux-package:
-    needs:
-      - setup
-      - push-linux-docker
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - platform: linux/amd64
-            platform-name: linux-amd64
-          - platform: linux/arm64/v8
-            platform-name: linux-arm64
-          - platform: linux/arm/v7
-            platform-name: linux-armv7
-          - platform: linux/arm/v6
-            platform-name: linux-armv6
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v5
-
-      - uses: ./.github/actions/upload-linux-package
-        with:
-          platform: ${{ matrix.platform }}
-          platform-name: ${{ matrix.platform-name }}
-          docker-image-name: ${{ vars.DOCKER_IMAGE_NAME }}
-          docker-version: ${{ needs.setup.outputs.docker-version }}
-          docker-username: ${{ vars.DOCKER_USERNAME }}
-          docker-password: ${{ secrets.DOCKER_PASSWORD }}
-          package-file-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-file-name-prefix }}
-          package-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-artifact-name-prefix }}
-
  build-windows-backend:
    needs:
      - setup
@@ -157,17 +153,17 @@ jobs:
          skip-tests: ${{ vars.SKIP_TESTS }}
          backend-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-backend-artifact-name-prefix }}

-  build-and-upload-windows-package:
+  build-windows-package:
    needs:
      - setup
      - build-windows-backend
-      - upload-linux-package
+      - build-linux-docker-and-package-x86
    runs-on: windows-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v5

-      - uses: ./.github/actions/build-and-upload-windows-package
+      - uses: ./.github/actions/build-windows-package
        with:
          package-file-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-file-name-prefix }}
          package-artifact-name-prefix: ${{ needs.setup.outputs.ezbookkeeping-package-artifact-name-prefix }}
@@ -177,13 +173,15 @@ jobs:
    runs-on: ubuntu-latest
    needs:
      - setup
-      - upload-linux-package
-      - build-and-upload-windows-package
+      - build-linux-docker-and-package-x86
+      - build-linux-docker-and-package-arm
+      - build-windows-package
+      - push-linux-docker
    steps:
      - name: Download all packaged files
        uses: actions/download-artifact@v4
        with:
-          pattern: ${{ needs.setup.outputs.ezbookkeeping_package_artifact_name_prefix }}-*
+          pattern: ${{ needs.setup.outputs.ezbookkeeping-package-artifact-name-prefix }}-*
          merge-multiple: true
          path: release-files