Skip to content

Commit

Permalink
Make mirai_on_mirai CI test work on Ubuntu (facebookexperimental#1117)
Browse files Browse the repository at this point in the history
* Experiment with z3 on ubuntu

* Make mirai_on_mirai work on Ubuntu
  • Loading branch information
Herman Venter committed Dec 22, 2021
1 parent 509fbec commit 51cfcee
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 6 deletions.
37 changes: 32 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
override: true
profile: minimal
components: clippy, rustc-dev, llvm-tools-preview

- name: Install Z3
run: |
cp binaries/libz3.dylib /usr/local/lib
Expand All @@ -33,20 +33,20 @@ jobs:
args: --all -- --test-threads=1
env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests"
RUSTFLAGS: "-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests"
- uses: actions-rs/grcov@v0.1

- name: Run grcov
- name: Run grcov
run: |
zip -0 cov.zip $(find . -name "mirai*.gc*" -print)
grcov cov.zip -s . -t lcov --llvm --ignore-not-existing --ignore "/*" -o lcov.info
- name: Upload coverage data to codecov.io
uses: codecov/codecov-action@v1
with:
files: "lcov.info"

mirai_on_mirai:
mirai_on_mirai_macos:
runs-on: macos-latest

steps:
Expand All @@ -73,3 +73,30 @@ jobs:
- name: Run MIRAI on MIRAI
run: |
cargo mirai
mirai_on_mirai_ubuntu:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Install toolchain
uses: actions-rs/toolchain@v1
with:
override: true
profile: minimal
components: clippy, rustc-dev, llvm-tools-preview

- name: Install Z3
run: |
sudo apt-get install libz3-dev
- name: Install MIRAI
uses: actions-rs/cargo@v1
with:
command: install
args: --path ./checker

- name: Run MIRAI on MIRAI
run: |
cargo mirai
4 changes: 3 additions & 1 deletion checker/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@
//

fn main() {
println!("cargo:rustc-link-search=binaries");
if cfg!(windows) {
println!("cargo:rustc-link-search=binaries");
}
}

0 comments on commit 51cfcee

Please sign in to comment.