Remove arm64 for now to test

canonical · Jun 5, 2024 · 45cd3cd · 45cd3cd
1 parent 201aed2
commit 45cd3cd
Showing 1 changed file with 46 additions and 30 deletions.
diff --git a/.github/workflows/build-and-test-snap.yml b/.github/workflows/build-and-test-snap.yml
@@ -13,7 +13,7 @@ env:
   SNAP_ARM64: chip-tool_${{ github.run_number}}_arm64.snap
 
 jobs:
-  build:
+  build-amd64:
     outputs:
       snap: ${{ steps.snapcraft.outputs.snap }}
     runs-on: ubuntu-latest
@@ -32,8 +32,8 @@ jobs:
           path: ${{ steps.snapcraft.outputs.snap }}
           if-no-files-found: error
 
-  test:
-    needs: build
+  test-amd64:
+    needs: build-amd64
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -68,32 +68,8 @@ jobs:
           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: ${{ env.SNAP_ARM64 }}
-          path: ${{ steps.build.outputs.snap }}
-
-  publish-snap:
-    needs: test
+  publish-amd64:
+    needs: [build-amd64, test-amd64]
     runs-on: ubuntu-latest
     steps:
       - name: Download locally built snap
@@ -105,5 +81,45 @@ jobs:
         env:
           SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
         with:
-          snap: ${{ needs.build.outputs.snap }}
+          snap: ${{ needs.build-amd64.outputs.snap }}
           release: edge/ieng-1057
+
+  # build-arm64:
+  #   needs: test-amd64
+  #   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: ${{ env.SNAP_ARM64 }}
+  #         path: ${{ steps.build.outputs.snap }}
+
+  # publish-arm64:
+  #   needs: [build-arm64]
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Download locally built snap
+  #       uses: actions/download-artifact@v4
+  #       with:
+  #         name: ${{ env.SNAP_AMD64 }}
+
+  #     - uses: snapcore/action-publish@v1
+  #       env:
+  #         SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+  #       with:
+  #         snap: ${{ needs.build-arm64.outputs.snap }}
+  #         release: edge/ieng-1057