diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 576c46e..ce90b5e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -36,9 +36,8 @@ jobs: - name: Yarn install FE dependencies run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install - - name: Build it - run: yarn build - - uses: tauri-apps/tauri-action@v0 + - name: "Build and release the app" + uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} @@ -49,3 +48,21 @@ jobs: releaseBody: "See the assets to download this version and install." releaseDraft: true prerelease: false + + + - name: "Full Bundle Tauri Release" + run: mv ./src-tauri/full-bundle-tauri.conf.json ./src-tauri/tauri.conf.json + + - name: "Build and release the app" + uses: tauri-apps/tauri-action@v0 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }} + TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + with: + tagName: __VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version + releaseName: "__VERSION__" + releaseBody: "See the assets to download this version and install." + releaseDraft: true + prerelease: false + includeUpdaterJson: false diff --git a/package.json b/package.json index 6bc96d2..36095f3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coh3-stats-desktop-app", "private": true, - "version": "1.5.1", + "version": "1.5.2", "type": "module", "repository": { "url": "https://github.com/cohstats/coh3-stats-desktop-app" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index f597797..fc8c262 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "coh3-stats-desktop-app" -version = "1.5.1" +version = "1.5.2" description = "COH3 Stats Desktop App" authors = ["coh3stats team"] license = "" diff --git a/src-tauri/full-bundle-tauri.conf.json b/src-tauri/full-bundle-tauri.conf.json new file mode 100644 index 0000000..4a331e6 --- /dev/null +++ b/src-tauri/full-bundle-tauri.conf.json @@ -0,0 +1,101 @@ +{ + "build": { + "beforeDevCommand": "yarn dev", + "beforeBuildCommand": "yarn build", + "devPath": "http://localhost:1420", + "distDir": "../dist" + }, + "package": { + "productName": "Coh3 Stats Desktop App - full bundle", + "version": "../package.json" + }, + "tauri": { + "allowlist": { + "clipboard": { + "writeText": true + }, + "dialog": { + "all": true + }, + "fs": { + "all": true, + "scope": ["$APPDATA/*"] + }, + "http": { + "all": true, + "scope": ["https://coh3-api.reliclink.com/*", "https://api.steampowered.com/*", "https://coh3stats.com/*"] + }, + "path": { + "all": true + }, + "shell": { + "open": true + }, + "window": { + "all": true + }, + "process": { + "all": true + } + }, + "bundle": { + "active": true, + "category": "DeveloperTool", + "copyright": "", + "deb": { + "depends": [] + }, + "externalBin": [], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "identifier": "com.coh3stats.desktop", + "longDescription": "", + "macOS": { + "entitlements": null, + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, + "signingIdentity": null + }, + "resources": [], + "shortDescription": "", + "targets": ["msi", "updater"], + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "", + "webviewInstallMode": { + "type": "offlineInstaller" + } + } + }, + "security": { + "csp": null + }, + "updater": { + "active": true, + "endpoints": ["https://coh3stats.com/api/appUpdateRoute"], + "dialog": true, + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IERFNjMzQTcwRjBEQjUwNTUKUldSVlVOdndjRHBqM21pc1BGYndieG03VVZOSGhxdUxPeDNkRkFqaXVpcEMyL2l1WUN6VDNCK1kK" + }, + "windows": [ + { + "label": "main", + "fullscreen": false, + "resizable": true, + "focus": true, + "title": "COH3 Stats Desktop App", + "width": 1000, + "minWidth": 900, + "height": 600, + "minHeight": 200, + "decorations": false + } + ] + } +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c437363..35063b4 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -7,7 +7,7 @@ }, "package": { "productName": "Coh3 Stats Desktop App", - "version": "1.5.1" + "version": "../package.json" }, "tauri": { "allowlist": { @@ -68,7 +68,10 @@ "windows": { "certificateThumbprint": null, "digestAlgorithm": "sha256", - "timestampUrl": "" + "timestampUrl": "", + "webviewInstallMode": { + "type": "embedBootstrapper" + } } }, "security": {