Skip to content

Commit 22a4559

Browse files
authored
Update submodule and include tests for Windows Aarch64 (#31)
Update the submodule to incorporate the fixes from pytorch/cpuinfo#283 and a (not-yet-merged) followup compilation fix from pytorch/cpuinfo#289.
1 parent 37d6f08 commit 22a4559

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -45,52 +45,46 @@ jobs:
4545
fail-fast: false
4646
matrix:
4747
include:
48-
- target: x86_64-unknown-linux-gnu
49-
os: ubuntu-latest
50-
name: Linux
48+
- os: ubuntu-latest
49+
name: Linux AMD64
50+
target: x86_64-unknown-linux-gnu
5151
cross: false
5252
test: true
5353

54-
- target: x86_64-apple-darwin
55-
os: macos-latest
54+
- os: macos-latest
5655
name: macOS
56+
target: x86_64-apple-darwin
5757
cross: false
5858
test: true
5959

6060
- os: windows-latest
61-
name: Windows
61+
name: Windows AMD64
6262
target: x86_64-pc-windows-msvc
6363
cross: false
6464
test: true
6565

66+
# Disabled because u_int is undefined in freebsd headers
6667
# - os: ubuntu-latest
6768
# name: FreeBSD
6869
# target: x86_64-unknown-freebsd
6970
# cross: true
7071
# test: false
7172

72-
- target: aarch64-linux-android
73-
os: ubuntu-latest
74-
name: Android
75-
cross: true
76-
test: true
77-
78-
- target: aarch64-apple-darwin
79-
os: macos-latest
73+
- os: macos-latest
8074
name: macOS
75+
target: aarch64-apple-darwin
8176
cross: false
8277
test: true
8378

84-
# - os: ubuntu-latest
85-
# name: OpenWrt
86-
# target: aarch64-unknown-linux-gnu
87-
# cross: true
88-
# test: true
89-
# cargo_args: --features "openwrt"
79+
- os: ubuntu-latest
80+
name: Android
81+
target: aarch64-linux-android
82+
cross: true
83+
test: true
9084

91-
# - target: armv7-unknown-linux-gnueabihf
92-
# os: ubuntu-latest
85+
# - os: ubuntu-latest
9386
# name: Linux ARMv7
87+
# target: armv7-unknown-linux-gnueabihf
9488
# cross: true
9589
# test: true
9690

@@ -110,15 +104,17 @@ jobs:
110104
if: ${{ matrix.cross }}
111105

112106
- name: Build
113-
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }}
107+
run: ${{ env.PROGRAM }} build --target=${{ matrix.target }}
114108

115109
- name: Test
116-
run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} ${{ matrix.cargo_args }}
110+
run: ${{ env.PROGRAM }} test --target=${{ matrix.target }}
117111
if: ${{ matrix.test }}
118112

119113
- name: Run example
114+
if: ${{ !matrix.cross }}
120115
run: cargo run --example info
121116
- uses: actions/upload-artifact@v4
117+
if: ${{ !matrix.cross }}
122118
with:
123119
name: info-${{ matrix.target }}
124-
path: info.txt
120+
path: info.txt

.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

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)

0 commit comments

Comments
 (0)