Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace macos-latest with macos-13 #366

Merged
merged 2 commits into from
Apr 28, 2024
Merged

Replace macos-latest with macos-13 #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf34e85
replace macos-latest with macos-13
ducaale Apr 28, 2024
adf4a2e
disable endpoints that randomly timeout
ducaale Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
os: ubuntu-latest
flags: --no-default-features --features=native-tls,online-tests # disables rustls
- target: x86_64-apple-darwin
os: macos-latest
os: macos-13
flags: --features=native-tls
- target: aarch64-apple-darwin
os: macos-14
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
os: ubuntu-latest
flags: --no-default-features --features=native-tls,online-tests # disables rustls
- target: x86_64-apple-darwin
os: macos-latest
os: macos-13
flags: --features=native-tls
- target: aarch64-apple-darwin
os: macos-14
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- os: ubuntu-latest
target: x86_64-unknown-linux-musl
use-cross: true
- os: macos-latest
- os: macos-13
target: x86_64-apple-darwin
flags: --features=native-tls
- os: macos-14
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

if [ "${{ matrix.job.os }}" = "windows-latest" ]; then
7z a "$staging.zip" $staging
elif [ "${{ matrix.job.os }}" = "macos-latest" ]; then
elif [[ "${{ matrix.job.os }}" =~ "macos" ]]; then
gtar czvf "$staging.tar.gz" $staging
else
tar czvf "$staging.tar.gz" $staging
Expand Down
5 changes: 5 additions & 0 deletions tests/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ fn proxy_multiple_valid_proxies() {

// temporarily disabled for builds not using rustls
#[cfg(all(feature = "online-tests", feature = "rustls"))]
#[ignore = "endpoint is randomly timing out"]
#[test]
fn verify_default_yes() {
use predicates::boolean::PredicateBooleanExt;
Expand All @@ -1215,6 +1216,7 @@ fn verify_default_yes() {

// temporarily disabled for builds not using rustls
#[cfg(all(feature = "online-tests", feature = "rustls"))]
#[ignore = "endpoint is randomly timing out"]
#[test]
fn verify_explicit_yes() {
use predicates::boolean::PredicateBooleanExt;
Expand All @@ -1229,6 +1231,7 @@ fn verify_explicit_yes() {
}

#[cfg(feature = "online-tests")]
#[ignore = "endpoint is randomly timing out"]
#[test]
fn verify_no() {
get_command()
Expand All @@ -1240,6 +1243,7 @@ fn verify_no() {
}

#[cfg(all(feature = "rustls", feature = "online-tests"))]
#[ignore = "endpoint is randomly timing out"]
#[test]
fn verify_valid_file() {
get_command()
Expand All @@ -1255,6 +1259,7 @@ fn verify_valid_file() {
// This test may fail if https://github.com/seanmonstar/reqwest/issues/1260 is fixed
// If that happens make sure to remove the warning, not just this test
#[cfg(all(feature = "native-tls", feature = "online-tests"))]
#[ignore = "endpoint is randomly timing out"]
#[test]
fn verify_valid_file_native_tls() {
get_command()
Expand Down