diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c641a8a7..570f7a97 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -99,7 +99,9 @@ jobs: if: matrix.template == 'js' || matrix.template == 'jupyter' || matrix.template == 'cppjswasm' || matrix.template == 'rustjswasm' || matrix.template == 'uitk-svelte' || matrix.template == 'uitk-webawesome' || matrix.template == 'site-react' || matrix.template == 'site-sveltekit' || matrix.template == 'site-webawesome' - name: Setup Rust - uses: actions-ext/rust/setup@10df15e12bbd1cc1cf48089f2e232349f98c74e7 + uses: actions-ext/rust/setup@3b918cc2cb4a231ad3752f8cc129da5f07626ce2 + with: + targets: ${{ matrix.template == 'rustjswasm' && 'wasm32-unknown-unknown' || '' }} if: matrix.template == 'rust' || matrix.template == 'rustjswasm' - name: Install JavaScript dependencies diff --git a/python/rust/.github/workflows/build.yaml.jinja b/python/rust/.github/workflows/build.yaml.jinja index b064507a..255c608e 100644 --- a/python/rust/.github/workflows/build.yaml.jinja +++ b/python/rust/.github/workflows/build.yaml.jinja @@ -71,7 +71,7 @@ jobs: version: {% raw %}${{ matrix.python }}{% endraw %} - name: Setup Rust - uses: actions-ext/rust/setup@10df15e12bbd1cc1cf48089f2e232349f98c74e7 + uses: actions-ext/rust/setup@3b918cc2cb4a231ad3752f8cc129da5f07626ce2 - name: Install dependencies run: make develop diff --git a/python/rust/rust/Makefile.jinja b/python/rust/rust/Makefile.jinja index 32d986e2..83a3b1ab 100644 --- a/python/rust/rust/Makefile.jinja +++ b/python/rust/rust/Makefile.jinja @@ -3,8 +3,8 @@ requirements: ## install required dev dependencies rustup component add rustfmt rustup component add clippy - cargo install --locked --force cargo-nextest - cargo install --force cargo-llvm-cov + cargo install --locked cargo-nextest + cargo install --locked cargo-llvm-cov develop: requirements ## install required dev dependencies diff --git a/python/rustjswasm/.github/workflows/build.yaml.jinja b/python/rustjswasm/.github/workflows/build.yaml.jinja index 48d759fa..e8d6d800 100644 --- a/python/rustjswasm/.github/workflows/build.yaml.jinja +++ b/python/rustjswasm/.github/workflows/build.yaml.jinja @@ -71,7 +71,9 @@ jobs: version: {% raw %}${{ matrix.python }}{% endraw %} - name: Setup Rust - uses: actions-ext/rust/setup@10df15e12bbd1cc1cf48089f2e232349f98c74e7 + uses: actions-ext/rust/setup@3b918cc2cb4a231ad3752f8cc129da5f07626ce2 + with: + targets: wasm32-unknown-unknown - name: Setup Node.js uses: actions-ext/node/setup@03c9f6b2d9c9fa2c26cfa22d0fa379a69329b319 diff --git a/python/rustjswasm/js/package.json.jinja b/python/rustjswasm/js/package.json.jinja index 255bbc3e..6d644803 100644 --- a/python/rustjswasm/js/package.json.jinja +++ b/python/rustjswasm/js/package.json.jinja @@ -25,7 +25,7 @@ "access": "public" }, "scripts": { - "setup": "cargo install -f wasm-bindgen-cli --version 0.2.129 --locked", + "setup": "cargo install wasm-bindgen-cli --version 0.2.129 --locked", "build:clean": "node -e \"const fs=require('fs'); fs.rmSync('dist',{recursive:true,force:true}); fs.rmSync('../{{ module }}/extension',{recursive:true,force:true})\"", "build:debug": "node build.mjs --debug", "build:rust": "cargo build --release --all-features --target wasm32-unknown-unknown --target-dir ../target", diff --git a/python/rustjswasm/rust/Makefile.jinja b/python/rustjswasm/rust/Makefile.jinja index 48e7a91b..ce5c2485 100644 --- a/python/rustjswasm/rust/Makefile.jinja +++ b/python/rustjswasm/rust/Makefile.jinja @@ -3,9 +3,9 @@ requirements: ## install required dev dependencies rustup component add rustfmt rustup component add clippy - cargo install --force --locked cargo-nextest - cargo install --force --locked cargo-llvm-cov - cargo install --force --locked wasm-bindgen-cli --version 0.2.129 + cargo install --locked cargo-nextest + cargo install --locked cargo-llvm-cov + cargo install --locked wasm-bindgen-cli --version 0.2.129 rustup target add wasm32-unknown-unknown develop: requirements ## install required dev dependencies