Merge pull request #6629 from libgit2/ethomson/flakes

ci: update to macOS 12

.github/workflows/benchmark.yml

@@ -27,7 +27,7 @@ jobs:
           os: ubuntu-latest
           setup-script: ubuntu
         - name: "macOS"
-          os: macos-11
+          os: macos-12
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release

.github/workflows/main.yml

@@ -63,7 +63,7 @@ jobs:
           os: ubuntu-latest
         - name: "macOS"
           id: macos
-          os: macos-11
+          os: macos-12
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
@@ -177,7 +177,7 @@ jobs:
           os: ubuntu-latest
         - name: "macOS (SHA256)"
           id: macos
-          os: macos-11
+          os: macos-12
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON -DEXPERIMENTAL_SHA256=ON

.github/workflows/nightly.yml

@@ -154,7 +154,7 @@ jobs:
             SKIP_SSH_TESTS: true
           os: ubuntu-latest
         - name: "macOS"
-          os: macos-11
+          os: macos-12
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON
@@ -294,7 +294,7 @@ jobs:
           os: ubuntu-latest
         - name: "macOS (SHA256)"
           id: macos
-          os: macos-10.15
+          os: macos-12
           env:
             CC: clang
             CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks -DUSE_GSSAPI=ON -DEXPERIMENTAL_SHA256=ON

ci/test.sh

@@ -261,6 +261,10 @@ if [ -n "$RUN_INVASIVE_TESTS" ]; then
 	unset GITTEST_INVASIVE_SPEED
 fi
 
+# the various network  tests can fail due to network connectivity problems;
+# allow them to retry up to 5 times
+export GITTEST_FLAKY_RETRY=5
+
 if [ -z "$SKIP_ONLINE_TESTS" ]; then
 	# Run the online tests.  The "online" test suite only includes the
 	# default online tests that do not require additional configuration.
@@ -271,16 +275,11 @@ if [ -z "$SKIP_ONLINE_TESTS" ]; then
 	echo "## Running networking (online) tests"
 	echo "##############################################################################"
 
-	# the online tests can fail due to network connectivity problems;
-	# allow them to retry up to 5 times
-	export GITTEST_FLAKY_RETRY=5
-
 	export GITTEST_REMOTE_REDIRECT_INITIAL="http://localhost:9000/initial-redirect/libgit2/TestGitRepository"
 	export GITTEST_REMOTE_REDIRECT_SUBSEQUENT="http://localhost:9000/subsequent-redirect/libgit2/TestGitRepository"
 	export GITTEST_REMOTE_SPEED_SLOW="http://localhost:9000/speed-9600/test.git"
 	export GITTEST_REMOTE_SPEED_TIMESOUT="http://localhost:9000/speed-0.5/test.git"
 	run_test online
-	unset GITTEST_FLAKY_RETRY
 	unset GITTEST_REMOTE_REDIRECT_INITIAL
 	unset GITTEST_REMOTE_REDIRECT_SUBSEQUENT
 	unset GITTEST_REMOTE_SPEED_SLOW
@@ -438,6 +437,8 @@ if [ -z "$SKIP_SSH_TESTS" ]; then
 	unset GITTEST_REMOTE_SSH_FINGERPRINT
 fi
 
+unset GITTEST_FLAKY_RETRY
+
 if [ -z "$SKIP_FUZZERS" ]; then
 	echo ""
 	echo "##############################################################################"