Skip to content

Commit 72c97c1

Browse files
committed
Update submodule and include tests for Windows Aarch64
1 parent a9cfae2 commit 72c97c1

File tree

7 files changed

+27
-9
lines changed

7 files changed

+27
-9
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: 16 additions & 1 deletion
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:
@@ -40,6 +40,12 @@ jobs:
4040
cross: false
4141
test: true
4242

43+
- os: windows-latest
44+
name: Windows
45+
target: aarch64-pc-windows-msvc
46+
cross: true
47+
test: true
48+
4349
# - os: ubuntu-latest
4450
# name: FreeBSD
4551
# target: x86_64-unknown-freebsd
@@ -80,6 +86,15 @@ jobs:
8086
run: cargo install cross
8187
if: ${{ matrix.cross }}
8288

89+
- name: Build aarch64-pc-windows-msvc Docker image
90+
# https://github.com/cross-rs/cross-toolchains/issues/32
91+
if: ${{ matrix.target == 'aarch64-pc-windows-msvc' }}
92+
run: |
93+
git clone https://github.com/cross-rs/cross --recurse-submodules
94+
cd cross
95+
cargo build-docker-image ${{ matrix.target }}-cross --platform x86_64-pc-windows-msvc --tag local
96+
# cargo build-docker-image ${{ matrix.target }}-cross --platform windows/amd64 --tag local
97+
8398
- name: Build
8499
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }}
85100

.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: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)