Skip to content

Commit 145c3a9

Browse files
committed
Update submodule and include tests for Windows Aarch64
1 parent a9cfae2 commit 145c3a9

File tree

7 files changed

+34
-10
lines changed

7 files changed

+34
-10
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
on:
2-
push:
3-
pull_request:
1+
on: [push, pull_request]
2+
3+
name: CI
44

55
jobs:
66
rust:

.github/workflows/cross.yaml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
on: [push, pull_request]
22

3-
name: CI
3+
name: Cross-compilation
44

55
jobs:
66
lint:
@@ -35,11 +35,24 @@ jobs:
3535
test: true
3636

3737
- os: windows-latest
38-
name: Windows
38+
name: Windows AMD64
3939
target: x86_64-pc-windows-msvc
4040
cross: false
4141
test: true
4242

43+
# Build on Linux because:
44+
# 1. cargo-cross doesn't ship MSRV images;
45+
# 2. Manually building this image with cross-toolchain instructions
46+
# results in a failure because `docker buildx build --platform ...`
47+
# doesn't recognize `--platform`, though the printed help text
48+
# indicates that it has no clue what `buildx` is in the first place
49+
# (not installed on GitHub runner-images?).
50+
- os: ubuntu-latest
51+
name: Windows AARCH64
52+
target: aarch64-pc-windows-msvc
53+
cross: true
54+
test: true
55+
4356
# - os: ubuntu-latest
4457
# name: FreeBSD
4558
# target: x86_64-unknown-freebsd
@@ -80,6 +93,14 @@ jobs:
8093
run: cargo install cross
8194
if: ${{ matrix.cross }}
8295

96+
- name: Build aarch64-pc-windows-msvc Docker image
97+
# https://github.com/cross-rs/cross-toolchains/issues/32
98+
if: ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
99+
run: |
100+
git clone https://github.com/cross-rs/cross --recurse-submodules
101+
cd cross
102+
cargo build-docker-image ${{ matrix.target }}-cross --tag local
103+
83104
- name: Build
84105
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }}
85106

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/target
22
/Cargo.lock
3-
info.txt
3+
/info.txt

Cross.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
[target.aarch64-linux-android]
22
# Workaround for https://github.com/cross-rs/cross/issues/1128
33
# and https://github.com/rust-lang/rust/issues/103673
4-
image = "ghcr.io/cross-rs/aarch64-linux-android:edge"
4+
image = "ghcr.io/cross-rs/aarch64-linux-android:edge"
5+
6+
[target.aarch64-pc-windows-msvc]
7+
# Cannot be hosted, must be built locally: https://github.com/cross-rs/cross-toolchains/issues/32
8+
image = "ghcr.io/cross-rs/aarch64-pc-windows-msvc-cross:local"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cpuinfo-rs title
1+
# cpuinfo-rs
22

33
[![Actions Status](https://github.com/Traverse-Research/cpuinfo-rs/actions/workflows/ci.yml/badge.svg)](https://github.com/Traverse-Research/cpuinfo-rs/actions)
44
[![Latest version](https://img.shields.io/crates/v/cpuinfo-rs.svg?logo=rust)](https://crates.io/crates/cpuinfo-rs)

info.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)