diff --git a/.changes/config.json b/.changes/config.json index c602f6d73089..d2add79c9436 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -18,7 +18,7 @@ "getPublishedVersion": "node ../../.scripts/covector/package-latest-version.js cargo ${ pkgFile.pkg.package.name } ${ pkgFile.pkg.package.version }", "prepublish": [ "sudo apt-get update", - "sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev", + "sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev", "cargo install cargo-audit --features=fix", { "command": "cargo generate-lockfile", @@ -295,4 +295,4 @@ "postversion": "cargo check" } } -} \ No newline at end of file +} diff --git a/.docker/cross/aarch64.Dockerfile b/.docker/cross/aarch64.Dockerfile index 6dfb5bdaa718..58609de4ddaf 100644 --- 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:arm64 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 index 2b4305fa2339..c51e7777fa0d 100644 --- 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/bench.yml b/.github/workflows/bench.yml index d2c15e2f1221..ebe094d6057c 100644 --- a/.github/workflows/bench.yml +++ b/.github/workflows/bench.yml @@ -52,7 +52,7 @@ jobs: run: | python -m pip install --upgrade pip sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev xvfb libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev xvfb wget https://github.com/sharkdp/hyperfine/releases/download/v1.11.0/hyperfine_1.11.0_amd64.deb sudo dpkg -i hyperfine_1.11.0_amd64.deb pip install memory_profiler diff --git a/.github/workflows/check-change-tags.yml b/.github/workflows/check-change-tags.yml index 6d312c9ef0d4..4bab09f79666 100644 --- 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 index 291a1b6b8dd8..a51125656ebe 100644 --- 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: @@ -67,7 +67,7 @@ jobs: - name: install Linux dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libsoup2.4-dev + sudo apt-get install -y libgtk-3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/check-license-header.yml b/.github/workflows/check-license-header.yml index 00893dc0cc4e..b182c7291f77 100644 --- 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 index db562f72cae8..49a50c20cfee 100644 --- 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 index 0416fafa6fe5..ddce58d58a02 100644 --- 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' } - { @@ -55,7 +55,7 @@ jobs: if: contains(matrix.platform.target, 'unknown-linux') run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: Swatinem/rust-cache@v2 @@ -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,10 +174,10 @@ 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 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2 - uses: Swatinem/rust-cache@v2 with: @@ -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 index e7bead27e72f..0b28ad5815cb 100644 --- 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 index 428f96e5050b..970307beb08b 100644 --- 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 @@ -115,7 +115,7 @@ jobs: - name: install dependencies run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - name: Test run: | diff --git a/.github/workflows/lint-cli.yml b/.github/workflows/lint-cli.yml index fab431052ba5..68b6611c78ee 100644 --- a/.github/workflows/lint-cli.yml +++ b/.github/workflows/lint-cli.yml @@ -24,7 +24,7 @@ concurrency: jobs: fmt: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -42,7 +42,7 @@ jobs: args: --manifest-path ./tooling/cli/Cargo.toml --all -- --check clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 @@ -57,7 +57,7 @@ jobs: - name: install dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libsoup2.4-dev + sudo apt-get install -y libgtk-3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/lint-core.yml b/.github/workflows/lint-core.yml index 8c2b496dda1d..5131e6bd13d2 100644 --- 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: @@ -62,7 +62,7 @@ jobs: - name: install dependencies run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: actions-rs/toolchain@v1 with: diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml index 89407bc5061e..e5ef64670e17 100644 --- 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 index 0f2ba3671249..df012ea30e8f 100644 --- 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 @@ -261,7 +261,7 @@ jobs: - name: install system dependencies run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - name: Test bindings run: yarn test test-linux-x64-musl-binding: @@ -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 index fd9ddcaa8aaa..3f6920d2c9d4 100644 --- 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 index 859c1ea5ca1b..3ae8d2ceec6b 100644 --- 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,10 +48,10 @@ 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 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml index 3b5cce2392a3..9ad727153181 100644 --- a/.github/workflows/test-cli-rs.yml +++ b/.github/workflows/test-cli-rs.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 @@ -41,10 +41,10 @@ jobs: override: true - 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 libgtk-3-dev libsoup2.4-dev + sudo apt-get install -y libgtk-3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index f1c7dde6723c..fcafb391ab7a 100644 --- 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' } - { @@ -75,7 +75,7 @@ jobs: if: contains(matrix.platform.target, 'unknown-linux') run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: Swatinem/rust-cache@v2 with: diff --git a/.github/workflows/test-lint-bundler.yml b/.github/workflows/test-lint-bundler.yml index 61fac1febcf8..9f7a1365429a 100644 --- 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 index 11a5689ef58c..3f06b7d243eb 100644 --- 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,10 +37,10 @@ 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 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: Swatinem/rust-cache@v2 with: @@ -91,7 +91,7 @@ jobs: TAURI_KEY_PASSWORD: # upload assets - uses: actions/upload-artifact@v3 - if: matrix.platform == 'ubuntu-latest' + if: matrix.platform == 'ubuntu-22.04' with: name: linux-updater-artifacts path: ./examples/updater/src-tauri/target/release/bundle/appimage/updater-example_*.AppImage.* diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml index e7fcdfdc188b..95df566eff0f 100644 --- 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: @@ -137,7 +137,7 @@ jobs: - name: install dependencies run: | sudo apt-get update - sudo apt-get install -y libgtk-3-dev libsoup2.4-dev + sudo apt-get install -y libgtk-3-dev - uses: Swatinem/rust-cache@v2 with: @@ -157,7 +157,7 @@ jobs: - name: Install required packages run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev - uses: actions-rs/cargo@v1 with: diff --git a/core/tauri/src/api/process.rs b/core/tauri/src/api/process.rs index 476aa38314f7..865a826d9a6c 100644 --- 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() { diff --git a/tooling/cli/templates/plugin/backend/.changes/config.json b/tooling/cli/templates/plugin/backend/.changes/config.json index 37c9a95e390a..680d32c82432 100755 --- a/tooling/cli/templates/plugin/backend/.changes/config.json +++ b/tooling/cli/templates/plugin/backend/.changes/config.json @@ -6,7 +6,7 @@ "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p' -", "prepublish": [ "sudo apt-get update", - "sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev", + "sudo apt-get install -y webkit2gtk-4.0", "cargo install cargo-audit", { "command": "cargo generate-lockfile", diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/audit.yml b/tooling/cli/templates/plugin/backend/.github/workflows/audit.yml index 319ba10a3928..b537951d288b 100644 --- a/tooling/cli/templates/plugin/backend/.github/workflows/audit.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/audit.yml @@ -19,7 +19,7 @@ on: jobs: audit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: actions-rs/audit-check@v1 diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml b/tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml index 8053e4b2a0b5..d99db74a2ace 100755 --- a/tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/covector-status.yml @@ -4,7 +4,7 @@ on: [pull_request] jobs: covector: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml index 979cf7039334..9d7e0eabda1d 100755 --- a/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/covector-version-or-publish.yml @@ -7,7 +7,7 @@ on: jobs: covector: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/format.yml b/tooling/cli/templates/plugin/backend/.github/workflows/format.yml index 44ba831ae1cb..7133c481b478 100644 --- a/tooling/cli/templates/plugin/backend/.github/workflows/format.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/format.yml @@ -12,7 +12,7 @@ on: jobs: format: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/lint.yml b/tooling/cli/templates/plugin/backend/.github/workflows/lint.yml index 7d3a62fb7ca1..0d3a0a85f6ae 100644 --- a/tooling/cli/templates/plugin/backend/.github/workflows/lint.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/lint.yml @@ -12,7 +12,7 @@ on: jobs: clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -21,7 +21,7 @@ jobs: - name: install webkit2gtk run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 - name: Install clippy with stable toolchain uses: actions-rs/toolchain@v1 with: diff --git a/tooling/cli/templates/plugin/backend/.github/workflows/test.yml b/tooling/cli/templates/plugin/backend/.github/workflows/test.yml index 20023cdab2a9..b411c07f39bd 100755 --- a/tooling/cli/templates/plugin/backend/.github/workflows/test.yml +++ b/tooling/cli/templates/plugin/backend/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v3 @@ -32,10 +32,10 @@ jobs: override: true - name: Install Linux dependencies - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 - uses: Swatinem/rust-cache@v2 diff --git a/tooling/cli/templates/plugin/with-api/.changes/config.json b/tooling/cli/templates/plugin/with-api/.changes/config.json index 04a316aec0b4..25df39379e32 100755 --- a/tooling/cli/templates/plugin/with-api/.changes/config.json +++ b/tooling/cli/templates/plugin/with-api/.changes/config.json @@ -6,7 +6,7 @@ "getPublishedVersion": "cargo search ${ pkg.pkg } --limit 1 | sed -nE 's/^[^\"]*\"//; s/\".*//1p' -", "prepublish": [ "sudo apt-get update", - "sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev", + "sudo apt-get install -y webkit2gtk-4.0", "cargo install cargo-audit", { "command": "cargo generate-lockfile", diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml index 352a6da28670..d01869b4112a 100644 --- a/tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml +++ b/tooling/cli/templates/plugin/with-api/.github/workflows/audit.yml @@ -19,7 +19,7 @@ on: jobs: audit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 - uses: rustsec/audit-check@v1 diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml index e1cbae04edf3..a6ad6de64d52 100644 --- a/tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml +++ b/tooling/cli/templates/plugin/with-api/.github/workflows/clippy.yml @@ -12,7 +12,7 @@ on: jobs: clippy: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false @@ -22,7 +22,7 @@ jobs: - name: Install dependencies run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 - name: Install clippy with stable toolchain uses: dtolnay/rust-toolchain@stable diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml index 7f75cde28fef..5934f6208c94 100644 --- a/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml +++ b/tooling/cli/templates/plugin/with-api/.github/workflows/covector-version-or-publish.yml @@ -7,7 +7,7 @@ on: jobs: covector: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/format.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/format.yml index c031d6238a3b..3222e6f9f4bf 100644 --- a/tooling/cli/templates/plugin/with-api/.github/workflows/format.yml +++ b/tooling/cli/templates/plugin/with-api/.github/workflows/format.yml @@ -12,7 +12,7 @@ on: jobs: format: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: fail-fast: false diff --git a/tooling/cli/templates/plugin/with-api/.github/workflows/test.yml b/tooling/cli/templates/plugin/with-api/.github/workflows/test.yml index b48381b71e0f..54797abe8850 100644 --- a/tooling/cli/templates/plugin/with-api/.github/workflows/test.yml +++ b/tooling/cli/templates/plugin/with-api/.github/workflows/test.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] steps: - uses: actions/checkout@v3 @@ -31,10 +31,10 @@ jobs: components: clippy - name: Install Linux dependencies - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-22.04' run: | sudo apt-get update - sudo apt-get install -y webkit2gtk-4.0 libsoup2.4-dev + sudo apt-get install -y webkit2gtk-4.0 - uses: Swatinem/rust-cache@v2