Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: fix toolchain #2060

Merged
merged 1 commit into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,24 @@ jobs:
steps:
- run: sudo apt -o Acquire::Retries=3 update
- run: sudo apt -o Acquire::Retries=3 install -y musl-tools lcov
- name: Cleanup working directory
run: rm -fr * $HOME/.cargo $HOME/.rustup
- uses: actions/checkout@v2

- name: Install rustup
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2022-06-28 -y
- uses: actions-rs/toolchain@v1
with:
target: x86_64-unknown-linux-gnu
toolchain: nightly-2022-06-28
profile: minimal
- name: Setup Rust toolchain
run: |
rustup show
rustup component add llvm-tools-preview
components: llvm-tools-preview

- name: Install cargo-llvm-cov
run: cargo install --version 0.4.1 cargo-llvm-cov
run: >
curl -LsSf 'https://github.com/taiki-e/cargo-llvm-cov/releases/download/v0.4.9/cargo-llvm-cov-x86_64-unknown-linux-musl.tar.gz'
| tar xzf -
&& mv cargo-llvm-cov $HOME/.cargo/bin

- name: Run cargo-llvm-cov
run: cargo llvm-cov --coverage-target-only --target x86_64-unknown-linux-gnu --manifest-path ${{ matrix.crate.path }}/Cargo.toml --lcov --output-path lcov.info ${{ matrix.crate.flags }}
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ jobs:
ENARX_BACKEND: ${{ matrix.backend.name }}
steps:
- run: sudo apt -o Acquire::Retries=3 update
- run: sudo apt -o Acquire::Retries=3 install -y musl-tools
- run: sudo apt -o Acquire::Retries=3 install -y musl-tools curl
- name: Cleanup working directory
run: rm -fr * $HOME/.cargo $HOME/.rustup
- uses: actions/checkout@v2

- name: Install rustup
run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2022-06-28 -y
- uses: actions-rs/toolchain@v1
with:
target: x86_64-unknown-linux-musl
target: x86_64-unknown-linux-gnu
toolchain: nightly-2022-06-28
profile: minimal
- name: Setup Rust toolchain
run: >
rustup override unset || :
&& rustup target add wasm32-wasi
&& rustup show

- uses: actions-rs/cargo@v1
with:
command: test
Expand Down