Skip to content

Commit

Permalink
Make sure we install clang on Windows CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael-F-Bryan authored and Michael-F-Bryan committed Jul 6, 2021
1 parent 3bf432d commit f129aa8
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 10 deletions.
15 changes: 12 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ jobs:
os:
- ubuntu-18.04
- macos-latest
# Note: we need to use pre-compiled TensorFlow Lite binaries on
# Windows, so ignore the Windows build for now
#- windows-latest
- windows-latest
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand All @@ -36,6 +34,17 @@ jobs:
if: runner.os == 'macOS'
- name: Setup Rust
run: rustup show
# We need to explicitly install clang and record where libclang is
# https://github.com/rust-lang/rust-bindgen/issues/1797
- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1
with:
version: "11.0"
directory: ${{ runner.temp }}/llvm
if: runner.os == 'Windows'
- name: Set LIBCLANG_PATH
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
if: runner.os == 'Windows'
- name: Type Check
uses: actions-rs/cargo@v1
with:
Expand Down
23 changes: 16 additions & 7 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
os: ubuntu-18.04
artifact_name: "target/rune.*.zip"
asset_name: rune-linux
# - name: windows
# os: windows-latest
# artifact_name: "target/rune.*.zip"
# asset_name: rune-windows
- name: windows
os: windows-latest
artifact_name: "target/rune.*.zip"
asset_name: rune-windows
- name: macos
os: macos-latest
artifact_name: "target/rune.*.zip"
Expand All @@ -65,10 +65,19 @@ jobs:
key: ${{ runner.os }}-${{ github.workflow }}-${{ github.job }}-${{ hashFiles('**/Cargo.lock') }}
- name: Setup Rust
run: |
rustup default nightly-2021-05-09
rustup target add wasm32-unknown-unknown
rustc --version --verbose
rustup show
rustc --version --verbose
# We need to explicitly install clang and record where libclang is
# https://github.com/rust-lang/rust-bindgen/issues/1797
- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1
with:
version: "11.0"
directory: ${{ runner.temp }}/llvm
if: runner.os == 'Windows'
- name: Set LIBCLANG_PATH
run: echo "LIBCLANG_PATH=$((gcm clang).source -replace "clang.exe")" >> $env:GITHUB_ENV
if: runner.os == 'Windows'
- name: Build
run: cargo xtask dist
env:
Expand Down

0 comments on commit f129aa8

Please sign in to comment.