Skip to content

Commit

Permalink
Resolve CI issues
Browse files Browse the repository at this point in the history
  • Loading branch information
encounter committed Nov 22, 2024
1 parent 3848edf commit f0af954
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 91 deletions.
34 changes: 21 additions & 13 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
toolchain: [ stable, 1.74.0, nightly ]
toolchain: [ stable, 1.81.0, nightly ]
fail-fast: false
env:
RUSTFLAGS: -D warnings
Expand All @@ -30,11 +30,13 @@ jobs:
uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.toolchain }}
components: rustfmt, clippy
components: clippy
- name: Cache Rust workspace
uses: Swatinem/rust-cache@v2
- name: Cargo check
run: cargo check --all-features --all-targets
run: cargo check --all-targets
- name: Cargo clippy
run: cargo clippy --all-features --all-targets
run: cargo clippy --all-targets

fmt:
name: Format
Expand Down Expand Up @@ -65,7 +67,7 @@ jobs:
continue-on-error: ${{ matrix.checks == 'advisories' }}
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
command: check ${{ matrix.checks }}

Expand All @@ -81,6 +83,8 @@ jobs:
uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: dtolnay/rust-toolchain@stable
- name: Cache Rust workspace
uses: Swatinem/rust-cache@v2
- name: Cargo test
run: cargo test --release

Expand All @@ -95,42 +99,42 @@ jobs:
target: x86_64-unknown-linux-musl
name: linux-x86_64
build: zigbuild
features: openssl-vendored
features: default
- platform: ubuntu-latest
target: i686-unknown-linux-musl
name: linux-i686
build: zigbuild
features: openssl-vendored
features: default
- platform: ubuntu-latest
target: aarch64-unknown-linux-musl
name: linux-aarch64
build: zigbuild
features: openssl-vendored
features: default
- platform: windows-latest
target: i686-pc-windows-msvc
name: windows-x86
build: build
features: openssl-vendored
features: default
- platform: windows-latest
target: x86_64-pc-windows-msvc
name: windows-x86_64
build: build
features: openssl-vendored
features: default
- platform: windows-latest
target: aarch64-pc-windows-msvc
name: windows-arm64
build: build
features: openssl-vendored
features: default
- platform: macos-latest
target: x86_64-apple-darwin
name: macos-x86_64
build: build
features: openssl
features: default
- platform: macos-latest
target: aarch64-apple-darwin
name: macos-arm64
build: build
features: openssl
features: default
fail-fast: false
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -148,6 +152,10 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.target }}
- name: Cache Rust workspace
uses: Swatinem/rust-cache@v2
with:
key: ${{ matrix.target }}
- name: Cargo build
run: >
cargo ${{ matrix.build }} --profile ${{ env.BUILD_PROFILE }} --target ${{ matrix.target }}
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ codegen-units = 1
[workspace.package]
version = "2.0.0-alpha.1"
edition = "2021"
rust-version = "1.74"
rust-version = "1.81"
authors = ["Luke Street <[email protected]>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/encounter/nod"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[crates.io]: https://crates.io/crates/nod
[Api Rustdoc]: https://img.shields.io/badge/api-rustdoc-blue.svg
[rustdoc]: https://docs.rs/nod
[Rust Version]: https://img.shields.io/badge/rust-1.74+-blue.svg?maxAge=3600
[Rust Version]: https://img.shields.io/badge/rust-1.81+-blue.svg?maxAge=3600

Library for traversing & reading Nintendo Optical Disc (GameCube and Wii) images.

Expand Down
Loading

0 comments on commit f0af954

Please sign in to comment.