-
Notifications
You must be signed in to change notification settings - Fork 0
Regenerate header bindings for the current target instead of reusing incompatible x64 Windows bindings #32
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
29b09fa
6f93cdc
b8a971f
8478459
974bfc9
b3c8f82
339228c
e819cbe
82cace9
60afef8
64b5b71
440a22e
5423a10
9b5adeb
832a6de
5cb898d
4ce62bc
dea60a5
ba6c7c7
8749f3c
803705e
7cfdd7c
7f93635
5504041
c640950
9226dea
524acd1
813c9a8
ebabab4
c5d8cd8
147179a
4d17aae
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| name: CI | ||
|
|
||
| on: | ||
| push: | ||
| pull_request: | ||
|
|
||
| jobs: | ||
| rust: | ||
|
|
@@ -14,8 +15,6 @@ jobs: | |
| run: cargo fmt --all -- --check | ||
| - name: Cargo clippy | ||
| run: cargo clippy --workspace --all-targets -- -D warnings | ||
| - name: Cargo test | ||
| run: cargo test --workspace | ||
|
Comment on lines
-17
to
-18
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Removed this test here as it is already covered by another build step for all targets. |
||
|
|
||
| rust-msrv: | ||
| name: Build-test MSRV (1.74) with minimal crate dependencies | ||
|
|
@@ -30,6 +29,90 @@ jobs: | |
| - uses: dtolnay/rust-toolchain@nightly | ||
| - name: Generate minimal-version dependencies | ||
| run: cargo -Zminimal-versions generate-lockfile | ||
| # The latest bindgen release has an underspecified proc-macro2 dependency: https://github.com/rust-lang/rust-bindgen/issues/3149 | ||
| - name: Update proc-macro2 to 1.0.80 | ||
| run: cargo update -p proc-macro2 --precise 1.0.80 | ||
| - uses: dtolnay/[email protected] | ||
| - name: Cargo check | ||
| run: cargo check --workspace --all-targets | ||
|
|
||
| cross: | ||
| name: ${{ matrix.name }} (${{ matrix.target }}) | ||
| runs-on: ${{ matrix.os }} | ||
| env: | ||
| PROGRAM: ${{ matrix.cross && 'cross' || 'cargo' }} | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - target: x86_64-unknown-linux-gnu | ||
| os: ubuntu-latest | ||
| name: Linux | ||
| cross: false | ||
| test: true | ||
|
|
||
| - target: x86_64-apple-darwin | ||
| os: macos-latest | ||
| name: macOS | ||
| cross: false | ||
| test: true | ||
|
|
||
| - os: windows-latest | ||
| name: Windows | ||
| target: x86_64-pc-windows-msvc | ||
| cross: false | ||
| test: true | ||
|
|
||
| # - os: ubuntu-latest | ||
| # name: FreeBSD | ||
| # target: x86_64-unknown-freebsd | ||
| # cross: true | ||
| # test: false | ||
maxded marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| - target: aarch64-linux-android | ||
| os: ubuntu-latest | ||
| name: Android | ||
| cross: true | ||
| test: true | ||
|
|
||
| # - os: ubuntu-latest | ||
| # name: OpenWrt | ||
| # target: aarch64-unknown-linux-gnu | ||
| # cross: true | ||
| # test: true | ||
| # cargo_args: --features "openwrt" | ||
maxded marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| # - target: armv7-unknown-linux-gnueabihf | ||
| # os: ubuntu-latest | ||
| # name: Linux ARMv7 | ||
| # cross: true | ||
| # test: true | ||
|
Comment on lines
+85
to
+89
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Mostly a cross compile issue, not an actual issue with the code so removing the test step for now. https://github.com/Traverse-Research/cpuinfo-rs/actions/runs/14644308875/job/41094360680 |
||
|
|
||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| submodules: true | ||
|
|
||
| - name: Bootstrap | ||
| uses: dtolnay/rust-toolchain@stable | ||
| with: | ||
| targets: ${{ matrix.target }} | ||
|
|
||
| - name: Install cross | ||
| run: cargo install cross | ||
| if: ${{ matrix.cross }} | ||
|
|
||
| - name: Build | ||
| run: ${{ env.PROGRAM }} build --target=${{ matrix.target }} ${{ matrix.cargo_args }} | ||
|
|
||
| - name: Test | ||
| run: ${{ env.PROGRAM }} test --target=${{ matrix.target }} ${{ matrix.cargo_args }} | ||
| if: ${{ matrix.test }} | ||
|
|
||
| - name: Run example | ||
| run: cargo run --example info | ||
| - uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: info-${{ matrix.target }} | ||
| path: info.txt | ||
This file was deleted.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| /target | ||
| /Cargo.lock | ||
| info.txt | ||
| /info.txt |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed the
pull_requestone as it would trigger our CI jobs twice which isn't needed.