build: simplify build configuration

julian-alarcon · Sep 19, 2023 · 878cebe · 878cebe
1 parent be05f67
commit 878cebe
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 47 deletions.
diff --git a/.github/workflows/release.yml → .github/workflows/build-release.yml b/.github/workflows/release.yml → .github/workflows/build-release.yml
@@ -1,12 +1,12 @@
-name: Build/release
+name: Build & Release
 
 on: [push]
 
 env:
   GH_TOKEN: ${{ SECRETS.GITHUB_TOKEN }}
 
 jobs:
-  release:
+  gitlab-release:
     runs-on: ${{ matrix.os }}
 
     # Platforms to build on/for
@@ -75,3 +75,33 @@ jobs:
           github.ref == 'refs/heads/main' &&
           startsWith(matrix.os, 'windows')
         run: yarn dist:windows -- --publish always
+  snap-release:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [x64, armv7l]
+    env:
+      SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+
+      - name: Build
+        run: yarn --link-duplicates --pure-lockfile
+
+      - name: Install Snapcraft
+        uses: samuelmeuli/action-snapcraft@v2
+
+      - name: Build for test only
+        if: github.ref != 'refs/heads/main'
+        run: yarn dist:linux:snap:${{ matrix.arch }} --publish never
+
+      - name: Release
+        if: github.ref == 'refs/heads/main'
+        run: yarn dist:linux:snap:${{ matrix.arch }} --publish always
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "prospect-mail",
   "productName": "Prospect Mail",
-  "version": "0.5.0-beta1",
+  "version": "0.5.0-beta2",
   "main": "src/main.js",
   "description": "Unofficial desktop client for Microsoft Outlook",
   "homepage": "https://github.com/julian-alarcon/prospect-mail",
@@ -57,9 +57,9 @@
     "dist:linux:targz": "electron-builder --x64 --arm64 --armv7l -l tar.gz",
     "dist:mac": "electron-builder --mac",
     "dist:windows": "electron-builder --windows --x64",
-    "dist:linux:x64": "electron-builder --x64 -l AppImage deb pacman rpm tar.gz",
+    "dist:linux:x64": "electron-builder --x64 -l AppImage deb pacman rpm snap tar.gz",
     "dist:linux:arm64": "electron-builder --arm64 -l AppImage deb pacman rpm tar.gz",
-    "dist:linux:arm": "electron-builder --armv7l -l AppImage deb pacman rpm tar.gz",
+    "dist:linux:arm": "electron-builder --armv7l -l AppImage deb pacman rpm snap tar.gz",
     "release": "electron-builder",
     "postinstall": "electron-builder install-app-deps"
   },
@@ -116,8 +116,10 @@
         "upower-observe"
       ],
       "publish": [
-        "github",
-        "snapStore"
+        {
+          "provider": "snapStore",
+          "channels": "beta"
+        }
       ],
       "allowNativeWayland": true
     },