From 8a523696239a0254a11ba601d1eee876dc8b1a44 Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Sat, 14 Sep 2024 15:08:18 +1000 Subject: [PATCH] Use setup-rust-toolchain to resolve depreciation warnings and toolchain toml --- .github/workflows/test_and_deploy.yml | 16 +++++----------- install_loader/rust-toolchain.toml | 5 +++++ 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 install_loader/rust-toolchain.toml diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 2dc7f09a..5357e88c 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -41,20 +41,14 @@ jobs: python-version: ${{ matrix.python-version }} # Configure Rust for 32-bit builds + # + # NOTE: Refer to install_loader/toolchain.toml for the installed toolchain and target architecture # Please use fixed versions of rust so that installs build consistently # (So they don't randomly trigger Windows Defender) + # + # CACHE NOTE: This action also provides Github Actions caching of rust builds (uses Swatinem/rust-cache internally) - name: Install and configure rust for 32-bit builds - uses: actions-rs/toolchain@v1 - with: - toolchain: 1.66.0 - target: i686-pc-windows-msvc - default: true - - # Caching for Rust - - name: Cache rust builds - uses: Swatinem/rust-cache@v2 - with: - workspaces: install_loader + uses: actions-rust-lang/setup-rust-toolchain@v1 # Run Python Deploy Script # This also installs and scans .exe with virustotal on Windows (to try prevent .exe virus false positives) diff --git a/install_loader/rust-toolchain.toml b/install_loader/rust-toolchain.toml new file mode 100644 index 00000000..d4e4232c --- /dev/null +++ b/install_loader/rust-toolchain.toml @@ -0,0 +1,5 @@ +[toolchain] +channel = "1.66.0" +components = [ ] +targets = [ "i686-pc-windows-msvc" ] +profile = "minimal" \ No newline at end of file