Skip to content

Commit

Permalink
Merge #32
Browse files Browse the repository at this point in the history
32: fix: temporarily disable building and testing on FreeBSD r=pitkley a=pitkley

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]: cross-rs/cross#613
[2]: cross-rs/cross#620
[3]: cross-rs/cross#609

Co-authored-by: Pit Kleyersburg <pitkley@googlemail.com>
  • Loading branch information
bors[bot] and pitkley authored Jan 29, 2022
2 parents 818118f + 8603568 commit 3dd378d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,14 @@ 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
# - rust: stable
# target: "x86_64-unknown-freebsd"
# use-cross: true
# continue-on-error: false

steps:
- name: Checkout
Expand Down Expand Up @@ -399,6 +403,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.
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ status = [
"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",
Expand Down

0 comments on commit 3dd378d

Please sign in to comment.