From b19cd04d51c0594059a9239c08a7e5da84dd0358 Mon Sep 17 00:00:00 2001 From: Gregor Vostrak Date: Wed, 28 Aug 2024 01:30:35 +0200 Subject: [PATCH] build linux arm64 images with mac runner --- .github/workflows/release.yml | 4 ++-- electron-builder.yml | 12 ++---------- package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cfc0b41..7799f2c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: - name: Install Snapcraft uses: samuelmeuli/action-snapcraft@v2 - if: ${{ matrix.platform == 'linux' }} + if: ${{ matrix.platform != 'windows' }} - name: Install Node.js uses: actions/setup-node@v3 @@ -52,7 +52,7 @@ jobs: if: ${{ matrix.platform == 'mac' }} run: | echo "$API_KEY" > apple.p8 - npx electron-builder --${{ matrix.platform }} --publish always + npx electron-builder --mac --linux --publish always env: GH_TOKEN: ${{ secrets.GH_TOKEN }} CSC_LINK: ${{ secrets.MAC_CERTS }} diff --git a/electron-builder.yml b/electron-builder.yml index 9b335c8..79e90ea 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -22,8 +22,6 @@ nsis: shortcutName: ${productName} uninstallDisplayName: ${productName} createDesktopShortcut: always -snap: - grade: stable mac: entitlementsInherit: build/entitlements.mac.plist target: @@ -42,14 +40,8 @@ dmg: linux: artifactName: ${name}-${arch}.${ext} target: - - target: deb - arch: - - x64 - - arm64 - - target: snap - arch: - - x64 - - arm64 + - deb + - snap - tar.gz - rpm desktop: # Define desktop elem diff --git a/package-lock.json b/package-lock.json index 7716219..52cc111 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "solidtime", - "version": "0.0.28", + "version": "0.0.29", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "solidtime", - "version": "0.0.28", + "version": "0.0.29", "hasInstallScript": true, "dependencies": { "@electron-toolkit/preload": "^3.0.0", diff --git a/package.json b/package.json index d33888a..5fe6e1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "solidtime", - "version": "0.0.28", + "version": "0.0.29", "description": "Desktop App for solidtime - the modern open-source time tracker", "main": "./out/main/index.js", "author": "solidtime.io",