Skip to content

Commit

Permalink
Revert "Try new config for gh actions/check"
Browse files Browse the repository at this point in the history
This reverts commit 9cf72da.
  • Loading branch information
vcfxb committed Jul 14, 2024
1 parent 1bf192a commit bb0dfcc
Showing 1 changed file with 12 additions and 18 deletions.
30 changes: 12 additions & 18 deletions .github/workflows/cargo-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:
cancel-in-progress: true

jobs:
install-llvm:
check:
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -46,11 +46,13 @@ jobs:
defaults:
run:
shell: ${{ matrix.shell }}

steps:
- name: Checkout Wright source
uses: actions/checkout@v4

# Use MSYS2 on windows to install and check LLVM
- name: Install LLVM 18 (Windows Only)
uses: msys2/setup-msys2@v2
- uses: msys2/setup-msys2@v2
if: ${{ matrix.os == 'windows-latest' }}
with:
update: true
Expand All @@ -60,6 +62,11 @@ jobs:
mingw-w64-x86_64-llvm
mingw-w64-x86_64-rust
# Use stable Rust toolchain
- uses: actions-rs/toolchain@v1
with:
toolchain: stable

- name: Install LLVM (Ubuntu Only)
if: ${{ matrix.os == 'ubuntu-latest' }}
# See: https://apt.llvm.org/
Expand All @@ -73,10 +80,7 @@ jobs:
- name: Install LLVM 18 (Mac Only)
if: ${{ matrix.os == 'macos-latest' }}
run: brew install llvm@18

check-llvm-version:
needs: install-llvm
steps:

- name: Get the LLVM version (Windows Only)
if: ${{ matrix.os == 'windows-latest' }}
run: llvm-config --version
Expand All @@ -92,16 +96,6 @@ jobs:
run: llvm-config --version
# For some reason, this seems to error even when llvm-config is available somewhere. Leaving it in for now.
continue-on-error: true

check:
steps:
- name: Checkout Wright source
uses: actions/checkout@v4

# Use stable Rust toolchain
- uses: actions-rs/toolchain@v1
with:
toolchain: stable

- name: Run cargo check (Mac Only)
if: ${{ matrix.os == 'macos-latest' }}
Expand Down

0 comments on commit bb0dfcc

Please sign in to comment.