cybercyst/xh
1
0
Fork 0
mirror of https://github.com/ducaale/xh.git synced 2025-05-05 23:42:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #366 from ducaale/explicit-macos-version

Browse Source 
Replace `macos-latest` with `macos-13`
This commit is contained in:
Mohamed Daahir 2024-04-28 23:37:57 +01:00 committed by GitHub
commit 755e9298c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -22,7 +22,7 @@ jobs:
os: ubuntu-latest os: ubuntu-latest
flags: --no-default-features --features=native-tls,online-tests # disables rustls flags: --no-default-features --features=native-tls,online-tests # disables rustls
- target: x86_64-apple-darwin - target: x86_64-apple-darwin
os: macos-latest os: macos-13
flags: --features=native-tls flags: --features=native-tls
- target: aarch64-apple-darwin - target: aarch64-apple-darwin
os: macos-14 os: macos-14

6
.github/workflows/release.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
os: ubuntu-latest os: ubuntu-latest
flags: --no-default-features --features=native-tls,online-tests # disables rustls flags: --no-default-features --features=native-tls,online-tests # disables rustls
- target: x86_64-apple-darwin - target: x86_64-apple-darwin
os: macos-latest os: macos-13
flags: --features=native-tls flags: --features=native-tls
- target: aarch64-apple-darwin - target: aarch64-apple-darwin
os: macos-14 os: macos-14
@ -70,7 +70,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
target: x86_64-unknown-linux-musl target: x86_64-unknown-linux-musl
use-cross: true use-cross: true
- os: macos-latest - os: macos-13
target: x86_64-apple-darwin target: x86_64-apple-darwin
flags: --features=native-tls flags: --features=native-tls
- os: macos-14 - os: macos-14
@ -127,7 +127,7 @@ jobs:
if [ "${{ matrix.job.os }}" = "windows-latest" ]; then if [ "${{ matrix.job.os }}" = "windows-latest" ]; then
7z a "$staging.zip" $staging 7z a "$staging.zip" $staging
elif [ "${{ matrix.job.os }}" = "macos-latest" ]; then elif [[ "${{ matrix.job.os }}" =~ "macos" ]]; then
gtar czvf "$staging.tar.gz" $staging gtar czvf "$staging.tar.gz" $staging
else else
tar czvf "$staging.tar.gz" $staging tar czvf "$staging.tar.gz" $staging

5
tests/cli.rs
View File

@ -1200,6 +1200,7 @@ fn proxy_multiple_valid_proxies() {
// temporarily disabled for builds not using rustls // temporarily disabled for builds not using rustls
#[cfg(all(feature = "online-tests", feature = "rustls"))] #[cfg(all(feature = "online-tests", feature = "rustls"))]
#[ignore = "endpoint is randomly timing out"]
#[test] #[test]
fn verify_default_yes() { fn verify_default_yes() {
use predicates::boolean::PredicateBooleanExt; use predicates::boolean::PredicateBooleanExt;
@ -1215,6 +1216,7 @@ fn verify_default_yes() {
// temporarily disabled for builds not using rustls // temporarily disabled for builds not using rustls
#[cfg(all(feature = "online-tests", feature = "rustls"))] #[cfg(all(feature = "online-tests", feature = "rustls"))]
#[ignore = "endpoint is randomly timing out"]
#[test] #[test]
fn verify_explicit_yes() { fn verify_explicit_yes() {
use predicates::boolean::PredicateBooleanExt; use predicates::boolean::PredicateBooleanExt;
@ -1229,6 +1231,7 @@ fn verify_explicit_yes() {
} }
#[cfg(feature = "online-tests")] #[cfg(feature = "online-tests")]
#[ignore = "endpoint is randomly timing out"]
#[test] #[test]
fn verify_no() { fn verify_no() {
get_command() get_command()
@ -1240,6 +1243,7 @@ fn verify_no() {
} }
#[cfg(all(feature = "rustls", feature = "online-tests"))] #[cfg(all(feature = "rustls", feature = "online-tests"))]
#[ignore = "endpoint is randomly timing out"]
#[test] #[test]
fn verify_valid_file() { fn verify_valid_file() {
get_command() get_command()
@ -1255,6 +1259,7 @@ fn verify_valid_file() {
// This test may fail if https://github.com/seanmonstar/reqwest/issues/1260 is fixed // 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 // If that happens make sure to remove the warning, not just this test
#[cfg(all(feature = "native-tls", feature = "online-tests"))] #[cfg(all(feature = "native-tls", feature = "online-tests"))]
#[ignore = "endpoint is randomly timing out"]
#[test] #[test]
fn verify_valid_file_native_tls() { fn verify_valid_file_native_tls() {
get_command() get_command()