Skip to content

Commit 0aa5496

Browse files
committed
fixup! .github/workflows/ci.yml: test Windows on ARM.
1 parent 46abc83 commit 0aa5496

File tree

1 file changed

+4
-50
lines changed

1 file changed

+4
-50
lines changed

.github/workflows/ci.yml

+4-50
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
cargo test --no-run --release --target=aarch64-apple-ios
135135
cargo clean -p blst --release --target=aarch64-apple-ios
136136
echo
137-
elif [ $OSTYPE = "msys" ]; then
137+
elif [ $OSTYPE = "msys" -a $RUNNER_ARCH = "X64" ]; then
138138
if which clang-cl > /dev/null 2>&1; then
139139
echo '-- test i686-pc-windows-msvc'
140140
echo
@@ -149,17 +149,13 @@ jobs:
149149
cargo test --release --target=x86_64-pc-windows-gnu
150150
cargo clean -p blst --release --target=x86_64-pc-windows-gnu
151151
echo
152-
echo '-- build aarch64-pc-windows-msvc'
153-
echo
154-
rustup target add aarch64-pc-windows-msvc
155-
cargo test --no-run --release --target=aarch64-pc-windows-msvc
156-
find target/aarch64-pc-windows-msvc -name blst-\*.exe -exec cp {} blst-arm-test.exe \; -quit
157-
cargo clean -p blst --release --target=aarch64-pc-windows-msvc
158-
echo
159152
fi
160153
echo
161154
echo '--- cargo clippy'
162155
echo
156+
if ! which cargo-clippy > /dev/null 2>&1; then
157+
rustup component add clippy
158+
fi
163159
echo 'msrv = "1.56"' > .clippy.toml
164160
cargo clippy --release
165161
cargo clean -p blst
@@ -181,48 +177,6 @@ jobs:
181177
cd bindings/go
182178
go test -test.v
183179
184-
- uses: actions/upload-artifact@v4
185-
if: ${{ runner.os == 'Windows' }}
186-
with:
187-
name: blst-arm-test.exe
188-
path: bindings/rust/blst-arm-test.exe
189-
if-no-files-found: ignore
190-
191-
cargo-test-windows-on-arm:
192-
runs-on: windows-11-arm
193-
194-
steps:
195-
- uses: actions/download-artifact@v4
196-
with:
197-
name: blst-arm-test.exe
198-
199-
- name: Environment
200-
shell: bash
201-
run: |
202-
which cargo && cargo version || true
203-
which go && go version || true
204-
which gcc && gcc --version || true
205-
which clang && clang --version || true
206-
uname -a && echo ---
207-
env | sort
208-
echo ---
209-
set
210-
211-
- name: Rust
212-
shell: bash
213-
run: |
214-
if ! which cargo > /dev/null 2>&1; then
215-
curl -sSf -o rustup-init.exe https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe
216-
./rustup-init.exe --profile minimal --no-modify-path -y
217-
export PATH=$HOME/.cargo/bin:$PATH
218-
which cargo
219-
cargo version
220-
fi
221-
222-
- name: Test
223-
shell: bash
224-
run: ./blst-arm-test.exe
225-
226180
misc-ubuntu-latest:
227181
runs-on: ubuntu-latest
228182

0 commit comments

Comments
 (0)