From 8b9bd0f3d1a020c35cdfc20282ec9090a8892417 Mon Sep 17 00:00:00 2001 From: simonsan <14062932+simonsan@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:35:48 +0100 Subject: [PATCH] chore: enhance cross-check workflow by adding target platforms and updating job names (#1369) Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com> --- .github/workflows/cross-ci.yml | 35 ++++++++++++++++------------------ deny.toml | 8 ++------ 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cross-ci.yml b/.github/workflows/cross-ci.yml index 7817f466e..bddd06056 100644 --- a/.github/workflows/cross-ci.yml +++ b/.github/workflows/cross-ci.yml @@ -22,7 +22,7 @@ concurrency: jobs: cross-check: - name: Cross checking ${{ matrix.job.target }} + name: Cross checking ${{ matrix.job.target }} on ${{ matrix.rust }} runs-on: ${{ matrix.job.os }} strategy: fail-fast: false @@ -35,12 +35,11 @@ jobs: target: x86_64-pc-windows-msvc architecture: x86_64 use-cross: false - # FIXME: `aws-lc-sys` doesn't cross compile - # - os: windows-latest - # os-name: windows - # target: x86_64-pc-windows-gnu - # architecture: x86_64 - # use-cross: false + - os: windows-latest + os-name: windows + target: x86_64-pc-windows-gnu + architecture: x86_64 + use-cross: false - os: macos-13 os-name: macos target: x86_64-apple-darwin @@ -76,18 +75,16 @@ jobs: target: i686-unknown-linux-gnu architecture: i686 use-cross: true - # FIXME: `aws-lc-sys` doesn't cross compile - # - os: ubuntu-latest - # os-name: netbsd - # target: x86_64-unknown-netbsd - # architecture: x86_64 - # use-cross: true - # FIXME: `aws-lc-sys` doesn't cross compile - # - os: ubuntu-latest - # os-name: linux - # target: armv7-unknown-linux-gnueabihf - # architecture: armv7 - # use-cross: true + - os: ubuntu-latest + os-name: netbsd + target: x86_64-unknown-netbsd + architecture: x86_64 + use-cross: true + - os: ubuntu-latest + os-name: linux + target: armv7-unknown-linux-gnueabihf + architecture: armv7 + use-cross: true steps: - name: Checkout repository diff --git a/deny.toml b/deny.toml index 5e41450f1..14753b951 100644 --- a/deny.toml +++ b/deny.toml @@ -183,12 +183,8 @@ allow = [ ] # List of crates to deny deny = [ - - # "ansi_term@0.11.0", - # { crate = "ansi_term@0.11.0", reason = "you can specify a reason it is banned" }, - # Wrapper crates can optionally be specified to allow the crate when it - # is a direct dependency of the otherwise banned crate - # { crate = "ansi_term@0.11.0", wrappers = ["this-crate-directly-depends-on-ansi_term"] }, + { crate = "aws-lc-rs", reason = "this crate introduces exorbitant build effort and breaks cross-compilation" }, + { crate = "aws-lc-sys", reason = "this crate introduces exorbitant build effort and breaks cross-compilation" }, ] # List of features to allow/deny