From d35d269a76ca497d451d7c6e3111c5b43c1b8d5c Mon Sep 17 00:00:00 2001 From: IsaacShelton Date: Tue, 27 Aug 2024 14:42:37 -0500 Subject: [PATCH] Updated CI/CD to use nightly toolchain --- .github/workflows/remoteBuild.yml | 18 +++++++++--------- HOW_TO_COMPILE.md | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/remoteBuild.yml b/.github/workflows/remoteBuild.yml index 1f7cd59..c3ffd05 100644 --- a/.github/workflows/remoteBuild.yml +++ b/.github/workflows/remoteBuild.yml @@ -51,19 +51,19 @@ jobs: run: | export CC=x86_64-w64-mingw32-gcc export CXX=x86_64-w64-mingw32-g++ - - name: Download and extract prebuilt LLVM (Windows) + - name: Install latest Rust nightly + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + override: true + components: clippy + - name: Install LLVM and dependencies (Windows) if: ${{ matrix.os == 'windows-latest' }} shell: bash run: | - pacman -S mingw-w64-x86_64-gcc --no-confirm - pacman -S mingw-w64-x86_64-llvm --no-confirm - - name: Download static zlib libraries (Windows) - if: ${{ matrix.os == 'windows-latest' }} - run: | + C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-gcc --noconfirm + C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-llvm --noconfirm C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zlib --noconfirm - - name: Download zstd library (Windows) - if: ${{ matrix.os == 'windows-latest' }} - run: | C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zstd --noconfirm - name: Install LLVM and dependencies (macOS) if: ${{ matrix.os == 'macos-latest' }} diff --git a/HOW_TO_COMPILE.md b/HOW_TO_COMPILE.md index 412dc11..274bd6a 100644 --- a/HOW_TO_COMPILE.md +++ b/HOW_TO_COMPILE.md @@ -23,9 +23,9 @@ MSYS2 Setup: - Download MSYS2 - Install MSYS2 - Open the MSYS2 Mingw64 Prompt -- `pacman -S git --no-confirm` -- `pacman -S mingw-w64-x86_64-gcc --no-confirm` -- `pacman -S mingw-w64-x86_64-llvm --no-confirm` +- `pacman -S git --noconfirm` +- `pacman -S mingw-w64-x86_64-gcc --noconfirm` +- `pacman -S mingw-w64-x86_64-llvm --noconfirm` - `git clone https://github.com/IsaacShelton/Adept3x` - `cd Adept3x` - `LLVM_SYS_181_PREFIX=/mingw64 ~/.cargo/bin/cargo +nightly build --release`