Skip to content

Commit

Permalink
CI only on wasm (our target)
Browse files Browse the repository at this point in the history
This is a bit brute force. I suspect test will not work
  • Loading branch information
Zykino authored and Zykino committed Oct 13, 2024
1 parent 5aeb4c9 commit 0395b0c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 31 deletions.
2 changes: 1 addition & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[build]
target = "wasm32-wasi"
target = "wasm32-wasip1"
6 changes: 6 additions & 0 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
with:
components: rustfmt
- name: cargo fmt --check
Expand All @@ -51,6 +52,7 @@ jobs:
submodules: true
- name: Install ${{ matrix.toolchain }}
uses: dtolnay/rust-toolchain@master
target: wasm32-wasip1
with:
toolchain: ${{ matrix.toolchain }}
components: clippy
Expand All @@ -68,6 +70,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
with:
components: rustfmt
- name: cargo-semver-checks
Expand All @@ -84,6 +87,7 @@ jobs:
submodules: true
- name: Install nightly
uses: dtolnay/rust-toolchain@nightly
target: wasm32-wasip1
- name: Install cargo-docs-rs
uses: dtolnay/install@cargo-docs-rs
- name: cargo docs-rs
Expand All @@ -99,6 +103,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
- name: cargo install cargo-hack
uses: taiki-e/install-action@cargo-hack
# intentionally no target specifier; see https://github.com/jonhoo/rust-ci-conf/pull/4
Expand All @@ -120,6 +125,7 @@ jobs:
submodules: true
- name: Install ${{ matrix.msrv }}
uses: dtolnay/rust-toolchain@master
target: wasm32-wasip1
with:
toolchain: ${{ matrix.msrv }}
- name: cargo +${{ matrix.msrv }} check
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/nostd.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .github/workflows/safety.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
submodules: true
- name: Install nightly
uses: dtolnay/rust-toolchain@nightly
target: wasm32-wasip1
- run: |
# to get the symbolizer for debug symbol resolution
sudo apt install llvm
Expand Down Expand Up @@ -62,6 +63,7 @@ jobs:
echo "NIGHTLY=nightly-$(curl -s https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu/miri)" >> "$GITHUB_ENV"
- name: Install ${{ env.NIGHTLY }}
uses: dtolnay/rust-toolchain@master
target: wasm32-wasip1
with:
toolchain: ${{ env.NIGHTLY }}
components: miri
Expand All @@ -77,6 +79,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
- name: cargo test --test loom
run: cargo test --release --test loom
env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
submodules: true
- name: Install nightly
uses: dtolnay/rust-toolchain@nightly
target: wasm32-wasip1
- name: cargo generate-lockfile
if: hashFiles('Cargo.lock') == ''
run: cargo generate-lockfile
Expand All @@ -48,6 +49,7 @@ jobs:
- name: Install beta
if: hashFiles('Cargo.lock') != ''
uses: dtolnay/rust-toolchain@beta
target: wasm32-wasip1
- name: cargo update
if: hashFiles('Cargo.lock') != ''
run: cargo update
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
submodules: true
- name: Install ${{ matrix.toolchain }}
uses: dtolnay/rust-toolchain@master
target: wasm32-wasip1
with:
toolchain: ${{ matrix.toolchain }}
- name: cargo generate-lockfile
Expand Down Expand Up @@ -74,8 +75,10 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
- name: Install nightly for -Zminimal-versions
uses: dtolnay/rust-toolchain@nightly
target: wasm32-wasip1
- name: rustup default stable
run: rustup default stable
- name: cargo update -Zminimal-versions
Expand All @@ -102,6 +105,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
- name: cargo generate-lockfile
if: hashFiles('Cargo.lock') == ''
run: cargo generate-lockfile
Expand Down Expand Up @@ -137,6 +141,7 @@ jobs:
submodules: true
- name: Install stable
uses: dtolnay/rust-toolchain@stable
target: wasm32-wasip1
with:
components: llvm-tools-preview
- name: cargo install cargo-llvm-cov
Expand Down

0 comments on commit 0395b0c

Please sign in to comment.