Merge workflows

canonical · Mar 5, 2024 · 07f4479 · 07f4479
1 parent 504ca10
commit 07f4479
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 39 deletions.
diff --git a/.github/workflows/build-and-test-snap.yml b/.github/workflows/build-and-test-snap.yml
@@ -1,4 +1,4 @@
-name: Snap Tester
+name: Build&Test
 
 on:
   push:
@@ -14,7 +14,6 @@ jobs:
       snap: ${{ steps.snapcraft.outputs.snap }}
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v4
 
@@ -25,15 +24,14 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.snapcraft.outputs.snap }}
+          name: chip-tool_${{ github.run_number}}_amd64.snap
           path: ${{ steps.snapcraft.outputs.snap }}
           if-no-files-found: error
 
   test:
     needs: build
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -65,3 +63,27 @@ jobs:
         with:
           name: logs
           path: tests/*.log
+
+  build-arm64:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
+
+      - name: Build snap
+        uses: diddlesnaps/snapcraft-multiarch-action@v1
+        id: build
+        with:
+          architecture: arm64
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: chip-tool_${{ github.run_number}}_arm64.snap
+          path: ${{ steps.build.outputs.snap }}
diff --git a/.github/workflows/build-arm64.yaml b/.github/workflows/build-arm64.yaml