diff --git a/.github/workflows/ci-cd-web-desktop.yml b/.github/workflows/ci-cd-web-desktop.yml index 2703513..d1f5412 100644 --- a/.github/workflows/ci-cd-web-desktop.yml +++ b/.github/workflows/ci-cd-web-desktop.yml @@ -332,8 +332,6 @@ jobs: name: Desktop Release (Windows) if: ${{ startsWith(github.ref, 'refs/tags/v') }} runs-on: [ self-hosted, windows, desktop ] - env: - TAURI_PUBLIC_KEY: ${{ secrets.TAURI_PUBLIC_KEY }} defaults: run: working-directory: apps/desktop @@ -364,12 +362,6 @@ jobs: with: projectPath: apps/desktop - - name: Inject Tauri public key (post) - if: ${{ env.TAURI_PUBLIC_KEY != '' }} - shell: pwsh - run: | - $p = 'apps/desktop/src-tauri/tauri.conf.json' - (Get-Content $p) -replace 'REPLACE_WITH_TAURI_PUBLIC_KEY', $env:TAURI_PUBLIC_KEY | Set-Content $p - name: Upload latest.json + bundles to VPS uses: appleboy/scp-action@v0.1.7 diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml index 9c89ed1..c72241b 100644 --- a/.github/workflows/desktop-release.yml +++ b/.github/workflows/desktop-release.yml @@ -13,8 +13,6 @@ jobs: build: name: Build ${{ matrix.platform }} runs-on: ${{ matrix.runner }} - env: - TAURI_PUBLIC_KEY: ${{ secrets.TAURI_PUBLIC_KEY }} strategy: fail-fast: false matrix: @@ -52,18 +50,6 @@ jobs: - name: Install pnpm deps run: pnpm -C apps/desktop install --frozen-lockfile - - name: Inject Tauri public key (Linux/macOS) - if: ${{ env.TAURI_PUBLIC_KEY != '' && matrix.platform != 'windows' }} - run: | - set -euo pipefail - sed -i "s/REPLACE_WITH_TAURI_PUBLIC_KEY/${TAURI_PUBLIC_KEY//\//\\\/}/" apps/desktop/src-tauri/tauri.conf.json - - - name: Inject Tauri public key (Windows) - if: ${{ env.TAURI_PUBLIC_KEY != '' && matrix.platform == 'windows' }} - shell: pwsh - run: | - $p = 'apps/desktop/src-tauri/tauri.conf.json' - (Get-Content $p) -replace 'REPLACE_WITH_TAURI_PUBLIC_KEY', $env:TAURI_PUBLIC_KEY | Set-Content $p - name: Build desktop env: diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json index 08eb935..852d5f1 100644 --- a/apps/desktop/src-tauri/tauri.conf.json +++ b/apps/desktop/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "Raven", - "version": "0.1.3", + "version": "0.1.4", "identifier": "br.com.esdrasrenan.sistemadechamados", "build": { "beforeDevCommand": "pnpm run dev", @@ -29,7 +29,7 @@ "https://github.com/esdrasrenan/sistema-de-chamados/releases/latest/download/latest.json" ], "dialog": true, - "pubkey": "REPLACE_WITH_TAURI_PUBLIC_KEY" + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEM1RkE0NkZFMTM0NTA4N0MKUldSOENFVVQva2I2eFZ5TTA0WitpZGRPUXVmbUtjNXNleXlYb1ZKWVlERlZiVzYybUptT1pINlgK" }, "bundle": { "active": true,