diff options
| author | GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com> | 2025-03-02 18:27:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-02 18:27:11 +0100 |
| commit | 55893078dedcc2146e1468bc1075137e51700300 (patch) | |
| tree | 64eedaf83063abfea55cd4e4b2e9d51098090e74 /.github/workflows | |
| parent | 56b11edf186b3d87300cdac866f472956eb59e9c (diff) | |
| download | FlightCore-55893078dedcc2146e1468bc1075137e51700300.tar.gz FlightCore-55893078dedcc2146e1468bc1075137e51700300.zip | |
feat: Tauri 2.0 (#1054)
Updates Tauri to version 2.0 and updates code and other dependencies with it.
Loses some functionality in the process. See pull request description for full info.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/push-test.yml | 22 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 4 |
2 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/push-test.yml b/.github/workflows/push-test.yml index b347bbd8..182fae33 100644 --- a/.github/workflows/push-test.yml +++ b/.github/workflows/push-test.yml @@ -49,7 +49,7 @@ jobs: if: matrix.platform == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev - name: Create dist folder (Ubuntu only) if: matrix.platform == 'ubuntu-22.04' run: mkdir --parent src-vue/dist @@ -70,7 +70,7 @@ jobs: - name: install dependencies (ubuntu only) run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf + sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev - name: Move original TypeScript bindings run: | @@ -112,20 +112,20 @@ jobs: if: matrix.platform == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf - - name: Disable self-updater - shell: bash - run: | - jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new - rm src-tauri/tauri.conf.json - mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json + sudo apt-get install -y libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev + # - name: Disable self-updater + # shell: bash + # run: | + # jq '.tauri.updater.active = false' src-tauri/tauri.conf.json > src-tauri/tauri.conf.json.new + # rm src-tauri/tauri.conf.json + # mv src-tauri/tauri.conf.json.new src-tauri/tauri.conf.json - uses: Swatinem/rust-cache@v2 # Cache Rust build artifacts with: workspaces: | src-tauri - name: install app dependencies and build it env: - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} run: | npm clean-install cd src-vue && npm clean-install && cd .. @@ -133,7 +133,7 @@ jobs: - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - name: Upload Linux artifact if: matrix.platform == 'ubuntu-22.04' uses: actions/upload-artifact@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a287e60..82591bed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -49,7 +49,7 @@ jobs: src-tauri - name: install app dependencies and build it env: - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} run: | npm clean-install cd src-vue && npm clean-install && cd .. @@ -57,7 +57,7 @@ jobs: - uses: tauri-apps/tauri-action@v0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }} + TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }} - name: upload build artifact uses: actions/upload-artifact@v4 with: |