From f00556b4a9f4e80fb5eac02d0823d2bf9e0c97f9 Mon Sep 17 00:00:00 2001 From: Thomas de Zeeuw Date: Sun, 9 Jun 2024 14:18:05 +0200 Subject: [PATCH 1/2] Merge CheckTargets and CheckTier3Targets CI checks --- .github/workflows/ci.yml | 41 +++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 50b0ba9b0..6b676a05b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -124,25 +124,37 @@ jobs: #cargo fmt --all -- --check run: find src tests examples -type f -iname "*.rs" | xargs rustfmt --check CheckTargets: - runs-on: ubuntu-latest - timeout-minutes: 10 - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - name: Install all targets - run: make install_targets - - name: Install Cargo-hack - run: cargo install --debug cargo-hack - - name: Check all targets - run: make check_all_targets - CheckTier3Targets: - name: Check runs-on: ubuntu-latest timeout-minutes: 10 strategy: fail-fast: false matrix: - target: ["aarch64-apple-ios", "aarch64-apple-tvos", "aarch64-apple-visionos", "aarch64-unknown-openbsd", "arm64_32-apple-watchos", "armv7-sony-vita-newlibeabihf", "sparcv9-sun-solaris", "x86_64-pc-solaris", "x86_64-unknown-dragonfly", "x86_64-unknown-openbsd"] + target: + - aarch64-apple-darwin + - aarch64-apple-ios + - aarch64-apple-tvos + - aarch64-apple-visionos + - aarch64-linux-android + - aarch64-unknown-openbsd + - arm-linux-androideabi + - arm64_32-apple-watchos + - armv7-sony-vita-newlibeabihf + - i686-unknown-linux-gnu + - sparcv9-sun-solaris + - wasm32-wasi + - x86_64-apple-darwin + - x86_64-apple-ios + - x86_64-pc-solaris + - x86_64-pc-windows-gnu + - x86_64-pc-windows-msvc + - x86_64-unknown-dragonfly + - x86_64-unknown-freebsd + - x86_64-unknown-illumos + - x86_64-unknown-linux-gnu + - x86_64-unknown-linux-musl + - x86_64-unknown-netbsd + - x86_64-unknown-openbsd + - x86_64-unknown-redox steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly @@ -178,6 +190,5 @@ jobs: - Docs - Rustfmt - CheckTargets - - CheckTier3Targets steps: - run: exit 0 From fe3e07aa897aed10cb6d6d3397ebc421a02200d4 Mon Sep 17 00:00:00 2001 From: Thomas de Zeeuw Date: Sun, 9 Jun 2024 14:37:26 +0200 Subject: [PATCH 2/2] Skip x86_64-pc-windows-gnu Doesn't want to build. --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b676a05b..4a215c3f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,10 @@ jobs: - x86_64-apple-darwin - x86_64-apple-ios - x86_64-pc-solaris - - x86_64-pc-windows-gnu + # TODO: solve the following err: + # `Error calling dlltool 'x86_64-w64-mingw32-dlltool'`, build log: + # . + #- x86_64-pc-windows-gnu - x86_64-pc-windows-msvc - x86_64-unknown-dragonfly - x86_64-unknown-freebsd