.github/workflows/ci.yml: cast testing net wider.

Author: dot-asm

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-latest ]
 
     steps:
     - uses: actions/checkout@v4
@@ -42,9 +42,21 @@ jobs:
         sysctl hw 2>/dev/null && echo --- || true
         env | sort
 
+    - name: Install Rust
+      if: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' }}
+      shell: bash
+      run: |
+        if ! which cargo > /dev/null 2>&1; then
+            curl -sSf -o rustup-init.exe https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
+            ./rustup-init.exe --profile minimal --component clippy -y
+        fi
+
     - name: Rust
       shell: bash
       run: |
+        if [ -d "$HOME/.cargo/bin" ] && ! which cargo > /dev/null 2>&1; then
+            export PATH="$HOME/.cargo/bin:$PATH"
+        fi
         rustc --version --verbose
         export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
         cd bindings/rust
@@ -69,11 +81,11 @@ jobs:
         echo 'export RUST_MIN_STACK=$(($1 * 1024)); shift'  >> ulimit-s
         echo 'exec "$@"'                                    >> ulimit-s
         triplet=`rustc -vV | awk '/host:/ {print $2}' | tr 'a-z-' 'A-Z_'`
-        stack_size=`[ $OSTYPE = "msys" ] && echo 65 || echo 56`
+        stack_size=`[ $RUNNER_OS = "Windows" ] && echo 65 || echo 56`
         env BLST_TEST_NO_STD= \
             CARGO_TARGET_${triplet}_RUNNER="bash ulimit-s $stack_size" \
             cargo test --release
-        if [ `uname -s` = "Linux" ]; then
+        if [ $RUNNER_OS = "Linux" ]; then
             echo '--- test wasm32-wasip1'
             echo
             rustup target add wasm32-wasip1
@@ -97,8 +109,8 @@ jobs:
             echo '--- dry-run publish'
             echo
             ./publish.sh --dry-run
-        elif [ `uname -s` = "Darwin" ]; then
-            if [ $HOSTTYPE = "arm64" ]; then
+        elif [ $RUNNER_OS = "macOS" ]; then
+            if [ $RUNNER_ARCH = "ARM64" ]; then
                 echo '--- test x86_64-apple-darwin'
                 echo
                 rustup target add x86_64-apple-darwin
@@ -120,7 +132,7 @@ jobs:
                 cargo test --no-run --release --target=aarch64-apple-ios
             cargo clean -p blst --release --target=aarch64-apple-ios
             echo
-        elif [ $OSTYPE = "msys" ]; then
+        elif [ $RUNNER_OS = "Windows" -a $RUNNER_ARCH = "X64" ]; then
             if which clang-cl > /dev/null 2>&1; then
                 echo '-- test i686-pc-windows-msvc'
                 echo
@@ -135,13 +147,6 @@ jobs:
             cargo test --release --target=x86_64-pc-windows-gnu
             cargo clean -p blst --release --target=x86_64-pc-windows-gnu
             echo
-            echo '-- build aarch64-pc-windows-msvc'
-            echo
-            rustup target add aarch64-pc-windows-msvc
-            cargo test --no-run --release --target=aarch64-pc-windows-msvc
-            find target/aarch64-pc-windows-msvc -name blst-\*.exe -exec cp {} blst-arm-test.exe \; -quit
-            cargo clean -p blst --release --target=aarch64-pc-windows-msvc
-            echo
         fi
         echo
         echo '--- cargo clippy'
@@ -158,6 +163,7 @@ jobs:
         rm -rf ~/.cargo/registry/index/*/.cache
 
     - name: Go
+      if: ${{ runner.os != 'Windows' || runner.arch != 'ARM64' }}
       shell: bash
       run: |
         go version 2>/dev/null || exit 0
@@ -167,30 +173,6 @@ jobs:
         cd bindings/go
         go test -test.v
 
-    - uses: actions/upload-artifact@v4
-      if: ${{ runner.os == 'Windows' }}
-      with:
-        name: blst-arm-test.exe
-        path: bindings/rust/blst-arm-test.exe
-        if-no-files-found: ignore
-
-  cargo-test-windows-on-arm:
-    runs-on: ubuntu-latest
-    needs: rust-n-go
-
-    steps:
-    - uses: actions/download-artifact@v4
-      with:
-        name: blst-arm-test.exe
-
-    - name: wine-arm64
-      uses: addnab/docker-run-action@v3
-      with:
-        registry: https://index.docker.io/v1/
-        image: linaro/wine-arm64
-        options: --volume ${{ github.workspace }}:/blst --network=none
-        run: wine-arm64 cmd /c "cd \ && \blst\blst-arm-test.exe"
-
   misc-ubuntu-latest:
     runs-on: ubuntu-latest