Build snapcraft using snapcore/action-build

waybackarchiver · waybackarchiver · commit 9eae8e7071e6 · 2022-02-21T13:02:45.000Z
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
@@ -10,6 +10,7 @@ on:
       - "Makefile"
       - "build/**"
       - ".github/workflows/builder.yml"
+      - "snapcraft.yaml"
   pull_request:
     branches: "*"
     paths:
@@ -260,14 +261,8 @@ jobs:
         if-no-files-found: error
 
   snapcraft:
-    name: Build snap
+    name: Build Snap
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - i386
-          - amd64
-      fail-fast: false
     steps:
     - name: Check out code base
       if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
@@ -286,16 +281,15 @@ jobs:
       uses: docker/setup-qemu-action@v1
 
     - id: build
-      name: Build snap
-      uses: diddlesnaps/snapcraft-multiarch-action@v1
+      name: Build Snap
+      uses: snapcore/action-build@v1
       with:
-        architecture: ${{ matrix.platform }}
         snapcraft-channel: edge
 
     - name: Upload artifact
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ env.PRODUCT }}-snap-${{ matrix.platform }}
+        name: ${{ env.PRODUCT }}-snap
         path: ${{ steps.build.outputs.snap }}
 
     - name: Install snap
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -203,10 +203,6 @@ jobs:
   snapcraft:
     name: Build Snap
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - amd64
     steps:
     - name: Check out code base
       uses: actions/checkout@v2
@@ -223,10 +219,9 @@ jobs:
         sed -i "s/version: 'git'/version: '${version}'/g" snapcraft.yaml
 
     - id: build
-      name: Build snap
-      uses: diddlesnaps/snapcraft-multiarch-action@v1
+      name: Build Snap
+      uses: snapcore/action-publish@v1
       with:
-        architecture: ${{ matrix.platform }}
         snapcraft-channel: stable
 
     - name: Upload artifact
diff --git a/.github/workflows/snapcraft.yml b/.github/workflows/snapcraft.yml
@@ -11,11 +11,6 @@ permissions: write-all
 jobs:
   snapcraft:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        platform:
-          - i386
-          - amd64
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v2
@@ -32,16 +27,15 @@ jobs:
           sed -i "s/version: 'git'/version: '${version}'/g" snapcraft.yaml
 
       - id: build
-        name: Build snap
-        uses: diddlesnaps/snapcraft-multiarch-action@v1
+        name: Build Snap
+        uses: snapcore/action-publish@v1
         with:
-          architecture: ${{ matrix.platform }}
           snapcraft-channel: stable
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: snap-${{ matrix.platform }}
+          name: wayback-snap
           path: ${{ steps.build.outputs.snap }}
 
       - uses: snapcore/action-publish@v1
diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -11,10 +11,10 @@ description: |
 base: core18
 grade: stable
 confinement: strict
-
+compression: lzo
 architectures:
   #- build-on: [i386, amd64, arm64, armhf, ppc64el, s390x]
-  - build-on: [i386, amd64]
+  - build-on: amd64
 
 parts:
   wayback:
@@ -28,3 +28,4 @@ apps:
     plugs:
       - home
       - network
+      - network-bind
