From e2702402875d3b50d9ac7b46a57454e4ee708aeb Mon Sep 17 00:00:00 2001 From: Pit Kleyersburg Date: Sat, 29 Jan 2022 15:21:51 +0100 Subject: [PATCH] fix: temporarily disable building and testing on FreeBSD CI is currently failing due to [1] and [2], and they are not getting merged upstream due to [3] being required first. We have to reenable this once this is resolved. [1]: https://github.com/cross-rs/cross/pull/613 [2]: https://github.com/cross-rs/cross/pull/620 [3]: https://github.com/cross-rs/cross/pull/609 --- .github/workflows/ci.yml | 19 +++++++++++++++---- bors.toml | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2f8363..df1ede8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -102,10 +102,15 @@ jobs: target: "x86_64-pc-windows-gnu" use-cross: true continue-on-error: false - - rust: stable - target: "x86_64-unknown-freebsd" - use-cross: true - continue-on-error: false + # FIXME: reenable freebsd building/CI + # This is blocked by: + # - https://github.com/cross-rs/cross/pull/613 + # - https://github.com/cross-rs/cross/pull/620 + # NOTE: enable in bors.toml again, too! + # - rust: stable + # target: "x86_64-unknown-freebsd" + # use-cross: true + # continue-on-error: false steps: - name: Checkout @@ -399,6 +404,12 @@ jobs: exit "$exit_code" integration-test-freebsd: + # FIXME: reenable freebsd building/CI + # This is blocked by: + # - https://github.com/cross-rs/cross/pull/613 + # - https://github.com/cross-rs/cross/pull/620 + # NOTE: enable in bors.toml again, too! + if: 'false' runs-on: # The FreeBSD tests run on macOS because there are no FreeBSD runners available from GitHub, # and macOS is the only environment where nested virtualization can be used. diff --git a/bors.toml b/bors.toml index 1b190c4..7fa1e4c 100644 --- a/bors.toml +++ b/bors.toml @@ -2,11 +2,11 @@ status = [ "build (1.40.0, x86_64-unknown-linux-gnu, false, false)", "build (stable, x86_64-unknown-linux-gnu, false, false)", "build (beta, x86_64-unknown-linux-gnu, false, false)", - "build (stable, x86_64-unknown-freebsd, true, false)", + # "build (stable, x86_64-unknown-freebsd, true, false)", "build (stable, x86_64-unknown-linux-musl, false, false)", "build (stable, x86_64-pc-windows-gnu, true, false)", "integration-test-linux", - "integration-test-freebsd", + # "integration-test-freebsd", "integration-test-windows", "rustfmt", "clippy",