diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4df20c1..59f0c56 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,52 +45,46 @@ jobs: fail-fast: false matrix: include: - - target: x86_64-unknown-linux-gnu - os: ubuntu-latest - name: Linux + - os: ubuntu-latest + name: Linux AMD64 + target: x86_64-unknown-linux-gnu cross: false test: true - - target: x86_64-apple-darwin - os: macos-latest + - os: macos-latest name: macOS + target: x86_64-apple-darwin cross: false test: true - os: windows-latest - name: Windows + name: Windows AMD64 target: x86_64-pc-windows-msvc cross: false test: true + # Disabled because u_int is undefined in freebsd headers # - os: ubuntu-latest # name: FreeBSD # target: x86_64-unknown-freebsd # cross: true # test: false - - target: aarch64-linux-android - os: ubuntu-latest - name: Android - cross: true - test: true - - - target: aarch64-apple-darwin - os: macos-latest + - os: macos-latest name: macOS + target: aarch64-apple-darwin cross: false test: true - # - os: ubuntu-latest - # name: OpenWrt - # target: aarch64-unknown-linux-gnu - # cross: true - # test: true - # cargo_args: --features "openwrt" + - os: ubuntu-latest + name: Android + target: aarch64-linux-android + cross: true + test: true - # - target: armv7-unknown-linux-gnueabihf - # os: ubuntu-latest + # - os: ubuntu-latest # name: Linux ARMv7 + # target: armv7-unknown-linux-gnueabihf # cross: true # test: true @@ -110,15 +104,17 @@ jobs: if: ${{ matrix.cross }} - name: Build - run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }} + run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} - name: Test - run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} ${{ matrix.cargo_args }} + run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} if: ${{ matrix.test }} - name: Run example + if: ${{ !matrix.cross }} run: cargo run --example info - uses: actions/upload-artifact@v4 + if: ${{ !matrix.cross }} with: name: info-${{ matrix.target }} - path: info.txt \ No newline at end of file + path: info.txt diff --git a/.gitignore b/.gitignore index c664348..df60736 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ /target /Cargo.lock -/info.txt \ No newline at end of file +/info.txt diff --git a/README.md b/README.md index 59a6d8f..5a4ce28 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# cpuinfo-rs title +# cpuinfo-rs [![Actions Status](https://github.com/Traverse-Research/cpuinfo-rs/actions/workflows/ci.yml/badge.svg)](https://github.com/Traverse-Research/cpuinfo-rs/actions) [![Latest version](https://img.shields.io/crates/v/cpuinfo-rs.svg?logo=rust)](https://crates.io/crates/cpuinfo-rs) diff --git a/vendor/cpuinfo b/vendor/cpuinfo index 05332fd..f7580e4 160000 --- a/vendor/cpuinfo +++ b/vendor/cpuinfo @@ -1 +1 @@ -Subproject commit 05332fd802d9109a2a151ec32154b107c1e5caf9 +Subproject commit f7580e4350546dcb5f94c63a8fee3f441d2c21ae