fix(ci): run on ubuntu 22.04 (#11358)

* fix(ci): install libsoup2.4-dev * update action * ubuntu 22.04 * fix image * latest for cli checks * ubuntu 20.04 * Revert "ubuntu 20.04" This reverts commit 6fd0ebb. * fix audit * fix cli audit
tauri-apps · Oct 14, 2024 · 3c7258d · 3c7258d
1 parent c4b77c0
commit 3c7258d
Show file tree

Hide file tree

Showing 35 changed files with 915 additions and 1,032 deletions.
diff --git a/.changes/config.json b/.changes/config.json
@@ -295,4 +295,4 @@
       "postversion": "cargo check"
     }
   }
-}
+}
diff --git a/.docker/cross/aarch64.Dockerfile b/.docker/cross/aarch64.Dockerfile
@@ -41,4 +41,4 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
 
 RUN dpkg --add-architecture arm64
 RUN apt-get update
-RUN apt-get install --assume-yes --no-install-recommends libssl-dev:arm64 libdbus-1-dev:arm64 libsoup2.4-dev:arm64 libssl-dev:arm64 libgtk-3-dev:arm64 webkit2gtk-4.0-dev:arm64 libappindicator3-1:arm64 librsvg2-dev:arm64 patchelf:arm64
+RUN apt-get install --assume-yes --no-install-recommends libssl-dev:arm64 libdbus-1-dev:arm64: libsoup2.4-devarm64 libssl-dev:arm64 libgtk-3-dev:arm64 webkit2gtk-4.0-dev:arm64 libappindicator3-1:arm64 librsvg2-dev:arm64 patchelf:arm64
diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml
@@ -22,7 +22,7 @@ concurrency:
 
 jobs:
   audit-rust:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: rust audit
@@ -31,7 +31,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
   audit-js:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - name: audit workspace

diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
 

diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       api: ${{ steps.filter.outputs.api }}
       schema: ${{ steps.filter.outputs.schema }}
@@ -39,7 +39,7 @@ jobs:
               - 'core/tauri-config-schema/schema.json'
 
   api:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: changes
     if: needs.changes.outputs.api == 'true'
     steps:
@@ -52,7 +52,7 @@ jobs:
         run: ./.scripts/ci/has-diff.sh
 
   schema:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: changes
     if: needs.changes.outputs.schema == 'true'
     steps:

diff --git a/.github/workflows/check-license-header.yml b/.github/workflows/check-license-header.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: dorny/paths-filter@v2

diff --git a/.github/workflows/covector-status.yml b/.github/workflows/covector-status.yml
@@ -7,7 +7,7 @@ on: [pull_request]
 
 jobs:
   covector:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml
@@ -34,7 +34,7 @@ jobs:
             }
           - {
               target: x86_64-unknown-linux-gnu,
-              os: ubuntu-latest,
+              os: ubuntu-22.04,
               toolchain: '1.60.0'
             }
           - {
@@ -165,7 +165,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-13, windows-latest]
+        platform: [ubuntu-22.04, macos-13, windows-latest]
 
     steps:
       - uses: actions/checkout@v4
@@ -174,7 +174,7 @@ jobs:
       - name: install stable
         uses: dtolnay/rust-toolchain@stable
       - name: install Linux dependencies
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0 webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2
@@ -203,7 +203,7 @@ jobs:
           yarn test
 
   version-or-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 65
     permissions:
       actions: write # required for workflow_dispatch

diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
         with:
           toolchain: stable
       - name: install Linux dependencies
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2
@@ -56,7 +56,7 @@ jobs:
           yarn test
 
   version-or-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     timeout-minutes: 65
     outputs:
       change: ${{ steps.covector.outputs.change }}

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout
@@ -54,7 +54,7 @@ jobs:
 
   docker:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

diff --git a/.github/workflows/lint-core.yml b/.github/workflows/lint-core.yml
@@ -26,7 +26,7 @@ concurrency:
 
 jobs:
   fmt:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
           args: --all -- --check
 
   clippy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         clippy:

diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
@@ -17,7 +17,7 @@ concurrency:
 
 jobs:
   eslint-cli:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
@@ -37,7 +37,7 @@ jobs:
         run: yarn format:check
 
   eslint-api:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2

diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml
@@ -238,7 +238,7 @@ jobs:
           - '16'
           - '18'
           - '20'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - name: Setup node
@@ -275,7 +275,7 @@ jobs:
           - '16'
           - '18'
           - '20'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     container:
       image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
     steps:
@@ -321,7 +321,7 @@ jobs:
         image:
           - ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
           - ghcr.io/napi-rs/napi-rs/nodejs:armhf-16
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
         working-directory: ${{ github.workspace }}
@@ -363,7 +363,7 @@ jobs:
             ls -la
   publish:
     name: Publish
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs:
       #- build-freebsd
       - test-macOS-windows-binding

diff --git a/.github/workflows/publish-cli-rs.yml b/.github/workflows/publish-cli-rs.yml
@@ -53,7 +53,7 @@ jobs:
           key: ${{ matrix.config.rust_target }}
 
       - name: install Linux dependencies
-        if: matrix.config.os == 'ubuntu-latest'
+        if: matrix.config.os == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev
@@ -73,7 +73,7 @@ jobs:
 
   upload:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/test-cli-js.yml b/.github/workflows/test-cli-js.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
           cache-dependency-path: tooling/cli/node/yarn.lock
 
       - name: install Linux dependencies
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -38,7 +38,7 @@ jobs:
             }
           - {
               target: x86_64-unknown-linux-gnu,
-              os: ubuntu-latest,
+              os: ubuntu-22.04,
               toolchain: '1.60.0'
             }
           - {

diff --git a/.github/workflows/test-lint-bundler.yml b/.github/workflows/test-lint-bundler.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -49,7 +49,7 @@ jobs:
           cargo test
 
   fmt:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2
@@ -67,7 +67,7 @@ jobs:
           args: --manifest-path ./tooling/bundler/Cargo.toml --all -- --check
 
   clippy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/test-updater-artifacts.yml b/.github/workflows/test-updater-artifacts.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [ubuntu-22.04, macos-latest, windows-latest]
 
     steps:
       - uses: actions/checkout@v2
@@ -37,7 +37,7 @@ jobs:
           toolchain: stable
 
       - name: install Linux dependencies
-        if: matrix.platform == 'ubuntu-latest'
+        if: matrix.platform == 'ubuntu-22.04'
         run: |
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
@@ -90,17 +90,17 @@ jobs:
           TAURI_PRIVATE_KEY: dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5YTBGV3JiTy9lRDZVd3NkL0RoQ1htZmExNDd3RmJaNmRMT1ZGVjczWTBKZ0FBQkFBQUFBQUFBQUFBQUlBQUFBQWdMekUzVkE4K0tWQ1hjeGt1Vkx2QnRUR3pzQjVuV0ZpM2czWXNkRm9hVUxrVnB6TUN3K1NheHJMREhQbUVWVFZRK3NIL1VsMDBHNW5ET1EzQno0UStSb21nRW4vZlpTaXIwZFh5ZmRlL1lSN0dKcHdyOUVPclVvdzFhVkxDVnZrbHM2T1o4Tk1NWEU9Cg==
           TAURI_KEY_PASSWORD:
       # upload assets
-      - uses: actions/upload-artifact@v2
-        if: matrix.platform == 'ubuntu-latest'
+      - uses: actions/upload-artifact@v3
+        if: matrix.platform == 'ubuntu-22.04'
         with:
           name: linux-updater-artifacts
           path: ./examples/updater/src-tauri/target/release/bundle/appimage/updater-example_*.AppImage.*
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: matrix.platform == 'windows-latest'
         with:
           name: windows-updater-artifacts
           path: ./examples/updater/src-tauri/target/release/bundle/msi/*
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: matrix.platform == 'macos-latest'
         with:
           name: macos-updater-artifacts

diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
@@ -20,7 +20,7 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       tauri: ${{ steps.filter.outputs.tauri }}
       build: ${{ steps.filter.outputs.build }}
@@ -58,7 +58,7 @@ jobs:
               - 'tooling/cli/**'
 
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: changes
     if: |
       needs.changes.outputs.tauri == 'true' ||
@@ -120,7 +120,7 @@ jobs:
       matrix: ${{ steps.create-matrix.outputs.matrix }}
 
   udeps:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: setup
     strategy:
       matrix:

diff --git a/core/tauri/src/api/process.rs b/core/tauri/src/api/process.rs
@@ -96,7 +96,7 @@ pub fn restart(env: &Env) {
 }
 
 #[cfg(target_os = "macos")]
-fn restart_macos_app(current_binary: &PathBuf, env: &Env) {
+fn restart_macos_app(current_binary: &std::path::Path, env: &Env) {
   use std::process::{exit, Command};
 
   if let Some(macos_directory) = current_binary.parent() {
-Original file line number
+Diff line change
@@ Expand Up / @@ -295,4 +295,4 @@ @@
           "postversion": "cargo check"
         }
       }
-    }
+    }