From a0db3b4e29908fcf0f4222b8bab1ae7cec288107 Mon Sep 17 00:00:00 2001 From: LynithDev <61880709+LynithDev@users.noreply.github.com> Date: Thu, 24 Jul 2025 11:18:51 +0200 Subject: [PATCH] chore: fix github actions --- .github/actions/setup-rust/action.yml | 18 +++++++++--------- .github/workflows/oneclient_release.yml | 1 + .github/workflows/onelauncher_release.yml | 1 + README.md | 2 +- .../{tauri.conf.json.bak => tauri.conf.json} | 0 rust-toolchain.toml | 3 +-- 6 files changed, 13 insertions(+), 12 deletions(-) rename apps/oneclient/desktop/{tauri.conf.json.bak => tauri.conf.json} (100%) diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 3fd88d7d..a3e88c3b 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -15,19 +15,19 @@ inputs: runs: using: composite steps: - - name: Install Rust Stable - uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a - with: - toolchain: stable - targets: ${{ inputs.target }} - components: clippy, rustfmt + # - name: Install Rust Stable + # uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + # with: + # toolchain: stable + # targets: ${{ inputs.target }} + # components: clippy, rustfmt - name: Install Rust Nightly - uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a + uses: dtolnay/rust-toolchain@master with: - toolchain: nightly + toolchain: nightly-2025-07-23 targets: ${{ inputs.target }} - components: clippy, rustfmt + components: cargo, clippy, rustc, rustfmt - name: Cache Rust if: ${{ inputs.restore-cache == 'true' }} diff --git a/.github/workflows/oneclient_release.yml b/.github/workflows/oneclient_release.yml index 15f36428..b9d48bfc 100644 --- a/.github/workflows/oneclient_release.yml +++ b/.github/workflows/oneclient_release.yml @@ -45,3 +45,4 @@ jobs: prerelease: ${{ startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-alpha') || false }} tauriScript: pnpm oneclient:desktop args: ${{ matrix.args }} + projectPath: ./apps/oneclient/desktop/ diff --git a/.github/workflows/onelauncher_release.yml b/.github/workflows/onelauncher_release.yml index 0b2e4a14..e7357bc2 100644 --- a/.github/workflows/onelauncher_release.yml +++ b/.github/workflows/onelauncher_release.yml @@ -45,3 +45,4 @@ jobs: prerelease: ${{ startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-alpha') || false }} tauriScript: pnpm onelauncher:desktop args: ${{ matrix.args }} + projectPath: ./apps/onelauncher/desktop/ diff --git a/README.md b/README.md index 99041200..89f27dc0 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ We welcome contributions! Please read our [contributing guidelines](CONTRIBUTING If you encounter any issues, ensure that you are using the following versions (or later) of Rust, Node and Pnpm: -- `rustc` version: **1.89** +- `rustc` version: **nightly-2025-07-23** - `node` version: **22.15** - `pnpm` version: **10.13** diff --git a/apps/oneclient/desktop/tauri.conf.json.bak b/apps/oneclient/desktop/tauri.conf.json similarity index 100% rename from apps/oneclient/desktop/tauri.conf.json.bak rename to apps/oneclient/desktop/tauri.conf.json diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 89a65aa7..0ae0d582 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,12 +1,11 @@ [toolchain] -channel = "nightly" +channel = "nightly-2025-07-23" profile = "minimal" components = [ "cargo", "clippy", "llvm-tools-preview", "rustc", - "rust-src", "rustfmt", "rust-docs", "rust-analyzer",