Merge pull request #4515 from epage/wasm

chore(ci): Force setting of toolchain target
clap-rs · Jan 3, 2023 · e7033f7 · e7033f7
2 parents a87b559 + 67864a4
commit e7033f7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 87 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -109,6 +109,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
       - name: Check
         run: make check-${{ matrix.features }}
+        env:
+          TOOLCHAIN_TARGET: ${{ matrix.target }}
   ui:
     name: UI Tests
     runs-on: ubuntu-latest

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -15,12 +15,15 @@ MSRV?=1.60.0
 _FEATURES = minimal default wasm full debug release
 _FEATURES_minimal = --no-default-features --features "std"
 _FEATURES_default =
-_FEATURES_wasm = --features "deprecated derive cargo env unicode string unstable-replace unstable-grouped"
+_FEATURES_wasm = --no-default-features --features "std help usage error-context suggestions" --features "deprecated derive cargo env unicode string unstable-replace unstable-grouped"
 _FEATURES_full = --features "deprecated derive cargo env unicode string unstable-replace unstable-grouped wrap_help"
 _FEATURES_next = ${_FEATURES_full} --features unstable-v5
 _FEATURES_debug = ${_FEATURES_full} --features debug --features clap_complete/debug
 _FEATURES_release = ${_FEATURES_full} --release
 
+check-wasm:
+	cargo check ${_FEATURES_${@:check-%=%}} ${ARGS}
+
 check-%:
 	cargo check ${_FEATURES_${@:check-%=%}} --all-targets ${ARGS}