From 76c4b76027c3f73943406e4fcb63d924e961a7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sawicz=20=28Saviq=29?= <michal@sawicz.net>
Date: Thu, 19 Jan 2023 10:12:52 +0100
Subject: [PATCH] snap: refresh for `ubuntu-latest` being 22.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Sawicz (Saviq) <michal@sawicz.net>
---
 .github/workflows/linux-snap.yml | 39 +++++++++-----------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/linux-snap.yml b/.github/workflows/linux-snap.yml
index be1a61a41..7ff8e2874 100644
--- a/.github/workflows/linux-snap.yml
+++ b/.github/workflows/linux-snap.yml
@@ -12,27 +12,22 @@ jobs:
   Snap:
     runs-on: ubuntu-latest
 
-    env:
-      SNAPCRAFT_BUILD_INFO: 1
-
     timeout-minutes: 60
     steps:
-    - name: Install Snapcraft
-      uses: samuelmeuli/action-snapcraft@v1
-
-    - name: Setup LXD
-      uses: whywaita/setup-lxd@v1
-
     - name: Check out code
       uses: actions/checkout@v2
       with:
         # Needed for version determination to work
         fetch-depth: 0
 
+    - name: Set up LXD
+      uses: canonical/setup-lxd@main
+
     - name: Set up CCache
       id: setup-ccache
       run: |
         sudo apt-get install ccache
+        mkdir -p ${HOME}/.ccache
         ccache --max-size=2G
         /snap/bin/lxc profile device add default ccache disk source=${HOME}/.ccache/ path=/root/.ccache
 
@@ -51,30 +46,18 @@ jobs:
           ccache-${{ runner.os }}-
         path: ~/.ccache/**
 
-    - name: Build
-      run: |
-        # Build the `subsurface` part.
-        /snap/bin/snapcraft build --use-lxd subsurface
+    - name: Build and verify the snap
+      uses: canonical/actions/build-snap@release
+      id: build-snap
+      with:
+        setup-lxd: false
 
     - name: Clear CCache stats
       run: ccache --show-stats --zero-stats
 
-    - name: Build and verify the snap
-      id: build-snap
-      env:
-        SNAP_ENFORCE_RESQUASHFS: 0
-      run: |
-        # Actually build the snap.
-        /snap/bin/snapcraft --use-lxd
-
-        sudo snap install review-tools
-        /snap/bin/review-tools.snap-review *.snap
-
-        echo "::set-output name=snap-file::$( ls *.snap )"
-
     - name: Upload the snap
       uses: actions/upload-artifact@v2
       with:
-        name: ${{ steps.build-snap.outputs.snap-file }}
-        path: ${{ steps.build-snap.outputs.snap-file }}
+        name: ${{ steps.build-snap.outputs.snap-name }}
+        path: ${{ steps.build-snap.outputs.snap-path }}
         if-no-files-found: error