From dd8d197c5b57323668f36f5865cabdd4597aadb7 Mon Sep 17 00:00:00 2001
From: windowsboy111 <wboy111@outlook.com>
Date: Sun, 16 Apr 2023 19:50:08 +0800
Subject: [PATCH] fix(ci): build json-build

---
 .github/workflows/build.yml      |  2 +-
 .github/workflows/json-build.yml | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 334beb6697..d87039d2b4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Generating artifact name
         id: art
         run: |
-          NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }}
+          NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }}
           x=${NAME//\//@}
           echo "name=$x" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
index 9028fd8a31..8f3357d556 100644
--- a/.github/workflows/json-build.yml
+++ b/.github/workflows/json-build.yml
@@ -13,9 +13,8 @@ jobs:
       matrix:
         pkg: ${{ fromJson(inputs.packages) }}
         version: ["37"]
-        arch: ["x86_64", "aarch64"]
       fail-fast: false
-    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
+    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
       image: ghcr.io/terrapkg/builder:37
       options: --cap-add=SYS_ADMIN --privileged
@@ -27,8 +26,8 @@ jobs:
 
       - uses: terrapkg/anda-build@main
         with:
-          name: "${{ matrix.pkg }}pkg"
-          mockConfig: anda-${{ matrix.version }}-${{ matrix.arch }}
+          name: "${{ matrix.pkg.pkg }}pkg"
+          mockConfig: anda-${{ matrix.version }}-${{ matrix.pkg.arch }}
           extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}"
           andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 
@@ -53,7 +52,7 @@ jobs:
 
       - name: Notify Madoguchi (Success)
         if: success()
-        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
       - name: Notify Madoguchi (Failure)
         if: cancelled() || failure()
-        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
+        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}