Merge branch 'main' of github.com:kryptokrona/hugin-desktop

kryptokrona · Nov 12, 2024 · c4377c0 · c4377c0
2 parents d249cb8 + 9f57513
commit c4377c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 61 deletions.
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           tag_name: ${{ github.ref }}
           release_name: Release ${{ github.ref }}
-          draft: false
+          draft: true
           prerelease: false
 
   build:
@@ -47,11 +47,6 @@ jobs:
             os: ubuntu-latest,
             platform: x64
           }
-          - {
-            name: "macOS-x64",
-            os: macos-latest,
-            platform: x64
-          }
           - {
             name: "macOS arm64",
             os: macos-latest,
@@ -61,6 +56,7 @@ jobs:
     env:
       PLATFORM: ${{ matrix.config.platform }}
       VERSION: ${{ github.ref_name }}  # This extracts the tag name
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - name: Check out Git repository
@@ -69,7 +65,7 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 16.16.0
+          node-version: 18.13.0
 
       - name: Install python-setuptools on macOS
         if: matrix.config.os == 'macos-11' || matrix.config.os == 'macos-latest'
@@ -129,59 +125,12 @@ jobs:
 
       - name: Build ${{ matrix.config.name }}
         if: matrix.config.os == 'ubuntu-latest'
-        run: npm run build:linux-$PLATFORM
+        run: npm run build:linux-x64-gh
 
       - name: Build ${{ matrix.config.name }}
         if: matrix.config.os == 'macos-latest'
         env:
           appleId: ${{ secrets.APPLE_ID }}
           appleIdPassword: ${{ secrets.APP_SPECIFIC_PASSWORD }}
           teamId: ${{ secrets.TEAM_ID }}
-        run: npm run build:mac-$PLATFORM
-
-      - name: Check artifacts --DEBUG--
-        run: ls dist
-
-      - name: Upload Release Asset Ubuntu
-        if: matrix.config.os == 'ubuntu-latest'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: dist/hugin-messenger_${{ env.VERSION }}_amd64.deb
-          asset_name: hugin-messenger_${{ env.VERSION }}_amd64.deb
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset macOS x64
-        if: matrix.config.os == 'macos-latest' && matrix.config.platform == 'x64'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: dist/Hugin Messenger-${{ env.VERSION }}.dmg
-          asset_name: Hugin Messenger_${{ env.VERSION }}_x64.dmg
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset macOS arm64
-        if: matrix.config.os == 'macos-latest' && matrix.config.platform == 'arm64'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: dist/Hugin Messenger-${{ env.VERSION }}-arm64.dmg
-          asset_name: Hugin Messenger_${{ env.VERSION }}_arm64.dmg
-          asset_content_type: application/octet-stream
-
-      - name: Upload Release Asset Windows
-        if: matrix.config.os == 'windows-latest'
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.create-release.outputs.upload_url }}
-          asset_path: dist/Hugin Messenger Setup ${{ env.VERSION }}.exe
-          asset_name: Hugin Messenger_Setup_${{ env.VERSION }}.exe
-          asset_content_type: application/x-msdownload
+        run: npm run build:mac-$PLATFORM-gh
diff --git a/build.config.json b/build.config.json
@@ -18,6 +18,8 @@
         "gatekeeperAssess": false,
         "entitlements": "bin/entitlements.mac.plist",
         "entitlementsInherit": "bin/entitlements.mac.inherit.plist",
+        "identity": "Lukas Nyberg (YT27J42JQ8)",
+        "provisioningProfile": "61be0696-8d71-4a17-8f96-53c50b8c6fdd.provisionprofile",
         "type": "development",
         "extendInfo": {
             "NSMicrophoneUsageDescription": "Please give us access to your microphone",
@@ -27,8 +29,7 @@
     "linux": {
         "icon": "build/icon.png",
         "target": [
-            "deb",
-            "snap"
+            "deb"
         ]
     },
     "files": [

diff --git a/package.json b/package.json
@@ -20,9 +20,10 @@
         "dev:svelte": "vite dev",
         "dev:electron": "electron src/backend/electron.cjs",
         "build:svelte": "vite build",
-        "build:win-x64-gh": "cross-env NODE_ENV=production vite build && electron-builder --win --x64 --config build.config.json -p never",
-        "build:mac-arm64-gh": "cross-env NODE_ENV=production vite build && electron-builder --mac --arm64 --config build.config.json -p never",
-        "build:mac-x64-gh": "cross-env NODE_ENV=production vite build && electron-builder --mac --x64 --config build.config.json -p never",
+        "build:win-x64-gh": "cross-env NODE_ENV=production vite build && electron-builder --win --x64 --config build.config.json -p always",
+        "build:mac-arm64-gh": "cross-env NODE_ENV=production vite build && electron-builder --mac --arm64 --config build.config.json -p always",
+        "build:mac-x64-gh": "cross-env NODE_ENV=production vite build && electron-builder --mac --x64 --config build.config.json -p always",
+        "build:linux-x64-gh": "cross-env NODE_ENV=production vite build && electron-builder --linux --x64 --config build.config.json -p always",
         "build:electron": "electron-builder --x64 --win --config build.config.json",
         "build:mac-arm64": "cross-env NODE_ENV=production vite build && electron-builder --mac --arm64 --config build.config.json -p never",
         "build:mac-x64": "cross-env NODE_ENV=production vite build && electron-builder --mac --x64 --config build.config.json -p never",