diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5373de2..29890de 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -355,7 +355,7 @@ jobs: set -e UV_PYTHON_DOWNLOADS=manual uv python install --managed-python ${{ steps.ci-config.outputs.default_python_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: just@${{ steps.ci-config.outputs.just_version }} diff --git a/.github/workflows/ci_check.yml b/.github/workflows/ci_check.yml index 291567f..131c5e6 100644 --- a/.github/workflows/ci_check.yml +++ b/.github/workflows/ci_check.yml @@ -80,12 +80,12 @@ jobs: save-if: false - name: Install cargo-deny - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-deny@${{ steps.ci-config.outputs.cargo_deny_version }} - name: Install cargo-about - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-about@${{ steps.ci-config.outputs.cargo_about_version }} diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml index 196602b..10142f0 100644 --- a/.github/workflows/ci_docs.yml +++ b/.github/workflows/ci_docs.yml @@ -77,7 +77,7 @@ jobs: set -e UV_PYTHON_DOWNLOADS=manual uv python install --managed-python ${{ steps.ci-config.outputs.default_python_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: just@${{ steps.ci-config.outputs.just_version }},sphinx-rustdocgen@1.0.1 diff --git a/.github/workflows/ci_go.yml b/.github/workflows/ci_go.yml index fa9841a..c4cf7d7 100644 --- a/.github/workflows/ci_go.yml +++ b/.github/workflows/ci_go.yml @@ -56,7 +56,7 @@ jobs: cache: false toolchain: ${{ steps.ci-config.outputs.rust_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-llvm-cov@${{ steps.ci-config.outputs.cargo_llvm_cov_version }},just@${{ steps.ci-config.outputs.just_version }} diff --git a/.github/workflows/ci_license_diff.yml b/.github/workflows/ci_license_diff.yml index e74bac4..fa7b9dd 100644 --- a/.github/workflows/ci_license_diff.yml +++ b/.github/workflows/ci_license_diff.yml @@ -57,7 +57,7 @@ jobs: toolchain: ${{ steps.ci-config.outputs.rust_version }} - name: Install cargo-about - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-about@${{ steps.ci-config.outputs.cargo_about_version }} diff --git a/.github/workflows/ci_node.yml b/.github/workflows/ci_node.yml index 5ea89d1..977eb92 100644 --- a/.github/workflows/ci_node.yml +++ b/.github/workflows/ci_node.yml @@ -83,7 +83,7 @@ jobs: cache-bin: false save-if: false - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-llvm-cov@${{ steps.ci-config.outputs.cargo_llvm_cov_version }},just@${{ steps.ci-config.outputs.just_version }} @@ -172,7 +172,7 @@ jobs: with: node-version: ${{ steps.ci-config.outputs.node_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: just@${{ steps.ci-config.outputs.just_version }} @@ -248,7 +248,7 @@ jobs: with: node-version: ${{ steps.ci-config.outputs.node_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: just@${{ steps.ci-config.outputs.just_version }} diff --git a/.github/workflows/ci_python.yml b/.github/workflows/ci_python.yml index 0031603..ebbc4fd 100644 --- a/.github/workflows/ci_python.yml +++ b/.github/workflows/ci_python.yml @@ -78,7 +78,7 @@ jobs: cache-bin: false save-if: false - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-llvm-cov@${{ steps.ci-config.outputs.cargo_llvm_cov_version }},just@${{ steps.ci-config.outputs.just_version }} @@ -216,7 +216,7 @@ jobs: set -e UV_PYTHON_DOWNLOADS=manual uv python install --managed-python ${{ steps.ci-config.outputs.default_python_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: just@${{ steps.ci-config.outputs.just_version }} diff --git a/.github/workflows/ci_rust.yml b/.github/workflows/ci_rust.yml index 236255f..d275dfc 100644 --- a/.github/workflows/ci_rust.yml +++ b/.github/workflows/ci_rust.yml @@ -125,7 +125,7 @@ jobs: python_home="$("$python_exe" -c 'import sys; print(sys.base_prefix)')" echo "$python_home" >> "$GITHUB_PATH" - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-llvm-cov@${{ steps.ci-config.outputs.cargo_llvm_cov_version }},cargo-nextest@${{ steps.ci-config.outputs.cargo_nextest_version }},just@${{ steps.ci-config.outputs.just_version }} diff --git a/.github/workflows/ci_wasm.yml b/.github/workflows/ci_wasm.yml index 573e978..ff75f39 100644 --- a/.github/workflows/ci_wasm.yml +++ b/.github/workflows/ci_wasm.yml @@ -78,7 +78,7 @@ jobs: cache-bin: false save-if: false - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: tool: cargo-llvm-cov@${{ steps.ci-config.outputs.cargo_llvm_cov_version }},just@${{ steps.ci-config.outputs.just_version }} @@ -86,19 +86,13 @@ jobs: with: node-version: ${{ steps.ci-config.outputs.node_version }} - # Work-around issue where the GitHub Repo for wasm-pack was moved breaking taiki-e/install-action from - # Installing wasm-pack. Once a new version of the action is released with the fix, re-enable this and remove the - # cargo install command for wasm-pack. - # - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 - # with: - # tool: wasm-pack@${{ steps.ci-config.outputs.wasm_pack_version }} + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 + with: + tool: wasm-pack@${{ steps.ci-config.outputs.wasm_pack_version }} - name: Run WebAssembly tests with coverage working-directory: ${{ env.NEMO_FLOW_CI_WORKSPACE }} - run: | - set -e - cargo install wasm-pack --version "${{ steps.ci-config.outputs.wasm_pack_version }}" --locked - just --set ci true --set output_dir "${{ github.workspace }}" test-wasm + run: just --set ci true --set output_dir "${{ github.workspace }}" test-wasm - name: Upload WebAssembly coverage to Codecov uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6 @@ -143,14 +137,9 @@ jobs: with: node-version: ${{ steps.ci-config.outputs.node_version }} - - uses: taiki-e/install-action@5939f3337e40968c39aa70f5ecb1417a92fb25a0 # v2.75.15 + - uses: taiki-e/install-action@c070f87102a1c75b3183910f391c1cb887fe13c8 # v2.77.6 with: - tool: just@${{ steps.ci-config.outputs.just_version }} - - - name: Install wasm-pack - run: | - set -e - cargo install wasm-pack --version "${{ steps.ci-config.outputs.wasm_pack_version }}" --locked + tool: just@${{ steps.ci-config.outputs.just_version }},wasm-pack@${{ steps.ci-config.outputs.wasm_pack_version }} - name: Create packaging output directory run: | diff --git a/justfile b/justfile index ec8d3bc..18dcbae 100644 --- a/justfile +++ b/justfile @@ -998,31 +998,13 @@ test-wasm: output_dir="{{ output_dir }}" coverage_out="" junit_out="" - rust_host="$(rustc -vV | sed -n 's/^host: //p')" - is_windows_arm64=false - case "${RUNNER_OS:-}:${RUNNER_ARCH:-}:$rust_host" in - Windows:ARM64:*|*:*:aarch64-pc-windows-msvc) - is_windows_arm64=true - ;; - esac cd "$NEMO_FLOW_REPO_ROOT" wasm-pack test --node crates/wasm npm install --workspace=nemo-flow-wasm --ignore-scripts if is_true "{{ ci }}"; then coverage_out="$(prepare_artifact wasm-js.xml)" junit_out="$(prepare_artifact wasm-junit.xml)" - if [[ "$is_windows_arm64" == true ]]; then - echo "Skipping wasm-opt for the Windows Arm64 wasm-pack package build" - rm -rf crates/wasm/pkg - ( - cd crates/wasm - wasm-pack build --no-opt --target nodejs --out-dir pkg - ) - node crates/wasm/scripts/prepare_pkg.mjs - npm --workspace=nemo-flow-wasm --ignore-scripts run coverage:pkg - else - npm run coverage:pkg --workspace=nemo-flow-wasm - fi + npm run coverage:pkg --workspace=nemo-flow-wasm cp crates/wasm/coverage/cobertura-coverage.xml "$coverage_out" cp crates/wasm/junit.xml "$junit_out" else