Skip to content

Commit d35d269

Browse files
committed
Updated CI/CD to use nightly toolchain
1 parent f02e2d8 commit d35d269

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Diff for: .github/workflows/remoteBuild.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ jobs:
5151
run: |
5252
export CC=x86_64-w64-mingw32-gcc
5353
export CXX=x86_64-w64-mingw32-g++
54-
- name: Download and extract prebuilt LLVM (Windows)
54+
- name: Install latest Rust nightly
55+
uses: actions-rs/toolchain@v1
56+
with:
57+
toolchain: nightly
58+
override: true
59+
components: clippy
60+
- name: Install LLVM and dependencies (Windows)
5561
if: ${{ matrix.os == 'windows-latest' }}
5662
shell: bash
5763
run: |
58-
pacman -S mingw-w64-x86_64-gcc --no-confirm
59-
pacman -S mingw-w64-x86_64-llvm --no-confirm
60-
- name: Download static zlib libraries (Windows)
61-
if: ${{ matrix.os == 'windows-latest' }}
62-
run: |
64+
C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-gcc --noconfirm
65+
C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-llvm --noconfirm
6366
C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zlib --noconfirm
64-
- name: Download zstd library (Windows)
65-
if: ${{ matrix.os == 'windows-latest' }}
66-
run: |
6767
C:\msys64\usr\bin\pacman -S mingw-w64-x86_64-zstd --noconfirm
6868
- name: Install LLVM and dependencies (macOS)
6969
if: ${{ matrix.os == 'macos-latest' }}

Diff for: HOW_TO_COMPILE.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ MSYS2 Setup:
2323
- Download MSYS2
2424
- Install MSYS2
2525
- Open the MSYS2 Mingw64 Prompt
26-
- `pacman -S git --no-confirm`
27-
- `pacman -S mingw-w64-x86_64-gcc --no-confirm`
28-
- `pacman -S mingw-w64-x86_64-llvm --no-confirm`
26+
- `pacman -S git --noconfirm`
27+
- `pacman -S mingw-w64-x86_64-gcc --noconfirm`
28+
- `pacman -S mingw-w64-x86_64-llvm --noconfirm`
2929
- `git clone https://github.com/IsaacShelton/Adept3x`
3030
- `cd Adept3x`
3131
- `LLVM_SYS_181_PREFIX=/mingw64 ~/.cargo/bin/cargo +nightly build --release`

0 commit comments

Comments
 (0)