#2728 build: update snapcraft build process and changelog

pbek · Mar 16, 2023 · b3993d3 · b3993d3
1 parent b403367
commit b3993d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -176,7 +176,7 @@ jobs:
   #
   build-snap:
     needs: create_release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     env:
       QT_VERSION: 5.15.2
     name: '🐧 Snap Qt 5.15.2'
@@ -193,31 +193,29 @@ jobs:
           export VERSION=$(cat version.h | sed 's/[^0-9,.]//g')
           echo "VERSION=${VERSION}" >> $GITHUB_ENV
 
-      - name: '⚙️ Install Snapcraft'
-        uses: samuelmeuli/action-snapcraft@v2
-        with:
-          use_lxd: true
-#          snapcraft_token: ${{ secrets.SNAP_TOKEN_GH }}
       - name: '⚙️ Cache Qt'
         id: cache-qt
         uses: actions/cache@v3
         with:
           path: ../Qt
           key: ${{runner.os}}-qtcachedir-${{env.QT_VERSION}}
+
       - name: '⚙️ Install Qt'
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{env.QT_VERSION}}
           modules: ${{env.QT_MODULES}}
           cache: ${{steps.cache-qt.outputs.cache-hit}}
+
       - name: '⚙️ Printenv'
         shell: bash
         run: |
           echo "VERSION=${VERSION}"
           printenv
 
       - name: '🚧 Compile application'
-        run: cd .. && sg lxd -c 'snapcraft --use-lxd' && ls
+        uses: snapcore/action-build@v1
+        id: snapcraft
 
       - name: '📤 Release Snap for Linux'
         uses: actions/upload-release-asset@v1
@@ -229,10 +227,6 @@ jobs:
           asset_name: QOwnNotes-amd64.snap
           asset_content_type: application/octet-stream
 
-      - shell: bash
-        run: |
-          snapcraft --version
-          cd .. && pwd
       - name: '📤 Deploy Snap'
         uses: snapcore/action-publish@v1
         continue-on-error: true
@@ -249,12 +243,6 @@ jobs:
 #          name: qownnotes_${{ env.VERSION }}_amd64.snap
 #          path: /home/runner/work/QOwnNotes/QOwnNotes/qownnotes_${{ env.VERSION }}_amd64.snap
 
-      - name: '📤 Upload artifact: Snap logs'
-        uses: actions/upload-artifact@v3
-        with:
-          name: snapcraft-logs
-          path: /home/runner/.cache/snapcraft/log/snapcraft-*.log
-
   #
   # Windows build
   #

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # QOwnNotes Changelog
 
+## 23.3.4
+- the **Snap build process was re-invented** because the necessary
+  Ubuntu 18.04 build system will vanish from GitHub with the end of March
+  (for [#2728](https://github.com/pbek/QOwnNotes/issues/2728))
+
 ## 23.3.3
 - unfortunately since 23.3.1 the **AppImage reports the wrong application path**, because
   of that update mechanism fails, this **should (could) be fixed** after this release