diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8410023131..324bb6e065 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Rust - run: rustup toolchain install stable --profile minimal && rustup default stable && rustup component add clippy rustfmt && rustc --version && cargo --version && rustup show + run: rustup toolchain install 1.74.1 --profile minimal && rustup default 1.74.1 && rustup component add clippy rustfmt && rustc --version && cargo --version && rustup show - name: Tauri dependencies run: >- sudo apt-get update && @@ -90,7 +90,7 @@ jobs: # install the latest Rust stable - name: Rust stable - run: rustup toolchain install stable --profile minimal + run: rustup toolchain install 1.74.1 --profile minimal && rustup default 1.74.1 - uses: Swatinem/rust-cache@v2 with: workspaces: "./backend/" diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 084aa3aa65..f0d667981a 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -36,16 +36,17 @@ jobs: ref: dev # Dev branch - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + run: rustup install 1.74.1 --profile minimal && rustup default 1.74.1 - - name: Rust Cache - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@v2 with: - workspaces: src-tauri + workspaces: "./backend/" + prefix-key: "rust-stable" key: ${{ matrix.targets.os }} + shared-key: "release" - name: Install the missing rust target (macOS Only) - if: startsWith(matrix.targets.os, 'macos-') + if: startsWith(matrix.targets.os, 'macos-') && matrix.targets.category == 'aarch64' run: | rustup target add aarch64-apple-darwin diff --git a/.github/workflows/macos-aarch64.yaml b/.github/workflows/macos-aarch64.yaml index bddb58ddf5..53c5b87e7b 100644 --- a/.github/workflows/macos-aarch64.yaml +++ b/.github/workflows/macos-aarch64.yaml @@ -8,20 +8,23 @@ env: jobs: macos-aarch64: - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout repository uses: actions/checkout@v4 - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + run: rustup install 1.74.1 --profile minimal && rustup default 1.74.1 - - name: Rust Cache - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@v2 with: - workspaces: src-tauri - key: macos-latest - + workspaces: "./backend/" + prefix-key: "rust-stable" + key: "macos-13" + shared-key: "release" + - uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: "15.0" - name: install the missing rust target run: | rustup target add aarch64-apple-darwin diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a58146bf2..214ac5f3e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,13 +33,14 @@ jobs: ref: main - name: install Rust stable - uses: dtolnay/rust-toolchain@stable + run: rustup install 1.74.1 --profile minimal && rustup default 1.74.1 - - name: Rust Cache - uses: Swatinem/rust-cache@v2 + - uses: Swatinem/rust-cache@v2 with: - workspaces: src-tauri + workspaces: "./backend/" + prefix-key: "rust-stable" key: ${{ matrix.targets.os }} + shared-key: "release" - name: Install the missing rust target (macOS Only) if: startsWith(matrix.targets.os, 'macos-')