Skip to content

Commit aa68721

Browse files
committed
Auto merge of #8530 - ehuss:ci-force-curl, r=alexcrichton
Update features set in CI. This removes the `curl/force-system-lib-on-osx` feature, which I don't think has been needed for a while (I believe it was fixed with alexcrichton/curl-rust#283). This also uses the same features for `test -p cargo-test-support` so that cargo doesn't get recompiled (saving about a minute).
2 parents dbbab42 + 7b241ea commit aa68721

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

.github/workflows/main.yml

+3-10
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,9 @@ jobs:
6161
if: matrix.os == 'ubuntu-latest'
6262
- run: rustup component add rustfmt || echo "rustfmt not available"
6363

64-
# Deny warnings on CI to avoid warnings getting into the codebase, and note
65-
# the `force-system-lib-on-osx` which is intended to fix compile issues on
66-
# OSX where compiling curl from source on OSX yields linker errors on Azure.
67-
#
68-
# Note that the curl issue is traced back to alexcrichton/curl-rust#279
69-
# where it looks like the OSX version we're actually running on is such that
70-
# a symbol is emitted that's never worked. For now force the system library
71-
# to be used to fix the link errors.
72-
- run: cargo test --features 'deny-warnings curl/force-system-lib-on-osx'
73-
- run: cargo test -p cargo-test-support
64+
# Deny warnings on CI to avoid warnings getting into the codebase.
65+
- run: cargo test --features 'deny-warnings'
66+
- run: cargo test --features 'deny-warnings' -p cargo-test-support
7467
- run: cargo test -p cargo-platform
7568

7669
resolver:

0 commit comments

Comments
 (0)