Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
milesgranger committed Sep 21, 2024
1 parent 30f81da commit fd1f3ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 22 deletions.
25 changes: 5 additions & 20 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ jobs:
with:
target: wasm32-unknown-emscripten

- name: Install nasm
run: sudo apt install nasm

- name: Install Emscripten
uses: mymindstorm/setup-emsdk@v14

Expand All @@ -73,35 +76,17 @@ jobs:
- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable

- name: Install build dependencies (Linux)
if: runner.os == 'Linux'
run: sudo apt install nasm

- name: Install build dependencies (Macos)
run: brew install nasm
if: runner.os == 'macOS'
- name: Install nasm
uses: ilammy/setup-nasm@v1

- name: Set MSVC developer prompt
if: runner.os == 'Windows'
uses: ilammy/msvc-dev-cmd@v1.6.0

- name: Install nasm (Windows)
if: runner.os == 'Windows'
uses: ilammy/setup-nasm@v1.2.0

- name: Test (shared)
run: cargo test --features shared --lib --release

- name: Test (static)
run: |
cargo clean # ensure we're starting fresh, no funny business
cargo test --no-default-features --features static --release
- name: Run examples
shell: bash
run: |
for example in $(find examples -name '*.rs'); do
example_name=$(basename $example .rs)
echo "------- Running example: ${example_name} -------"
cargo run --example $example_name
done
4 changes: 2 additions & 2 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[target.x86_64-unknown-linux-musl]
pre-build = [
"apt update"
"apt update",
"apt install -y llvm-dev libclang-dev clang nasm"
]
[target.s390x-unknown-linux-gnu]
pre-build = [
"apt update"
"apt update",
"apt install -y llvm-dev libclang-dev clang nasm"
]

0 comments on commit fd1f3ad

Please sign in to comment.