From cf34e85e71d8dfe5b2df37414d6544f285ec88bc Mon Sep 17 00:00:00 2001
From: Mohamed Daahir <sharaf.13@hotmail.com>
Date: Sun, 28 Apr 2024 22:20:31 +0100
Subject: [PATCH 1/2] replace macos-latest with macos-13

`macos-latest` is now an alias for `macos-14` which runs on apple silicon
---
 .github/workflows/ci.yaml      | 2 +-
 .github/workflows/release.yaml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ee1edeff..906ff7fe 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -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
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index ed6a8682..53e995f4 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -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
@@ -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
@@ -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

From adf4a2ea70a6c953f6beb9d83803558fcc2db313 Mon Sep 17 00:00:00 2001
From: Mohamed Daahir <sharaf.13@hotmail.com>
Date: Sun, 28 Apr 2024 23:06:19 +0100
Subject: [PATCH 2/2] disable endpoints that randomly timeout

---
 tests/cli.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/cli.rs b/tests/cli.rs
index 9e774f9f..8e004a61 100644
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -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;
@@ -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;
@@ -1229,6 +1231,7 @@ fn verify_explicit_yes() {
 }
 
 #[cfg(feature = "online-tests")]
+#[ignore = "endpoint is randomly timing out"]
 #[test]
 fn verify_no() {
     get_command()
@@ -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()
@@ -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()