From 9f1e819f96e42e60dd3f2421ad3c8064e3557f4c Mon Sep 17 00:00:00 2001
From: Fuzzbawls <fuzzbawls@gmail.com>
Date: Wed, 16 Oct 2024 19:22:51 -0700
Subject: [PATCH] [GA] Bump standard macOS to macos-13

macOS 12 runners are now deprecated and will be removed in December.
Bump the standard macOS runner version to macos-13 accordingly.
---
 .github/workflows/build-and-test.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 1e61004b4aa6b1..cdcadc52c4912c 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -106,12 +106,12 @@ jobs:
             cxx: g++
 
           - name: macOS
-            os: macos-12
-            python-version: '3.8'
-            packages: llvm@13 autoconf automake berkeley-db@4 libtool boost miniupnpc libnatpmp pkg-config qt@5 zmq libevent qrencode gmp libsodium
+            os: macos-13
+            python-version: '3.10'
+            packages: llvm@14 autoconf automake berkeley-db@4 libtool boost miniupnpc libnatpmp pkg-config qt@5 zmq libevent qrencode gmp libsodium
             boost_root: true
-            cc: $(brew --prefix llvm@13)/bin/clang
-            cxx: $(brew --prefix llvm@13)/bin/clang++
+            cc: $(brew --prefix llvm@14)/bin/clang
+            cxx: $(brew --prefix llvm@14)/bin/clang++
 
           - name: macOS-latest
             os: macos-14
@@ -226,11 +226,12 @@ jobs:
 
           - name: x64-macOS
             id: macOS-nodepends
-            os: macos-12
-            python-version: '3.8'
+            os: macos-13
+            python-version: '3.10'
             packages: autoconf automake ccache berkeley-db@4 libtool boost miniupnpc libnatpmp pkg-config qt@5 zmq libevent qrencode gmp libsodium librsvg
             unit_tests: true
             functional_tests: true
+            goal: deploy
             cc: clang
             cxx: clang++
             BITCOIN_CONFIG: "--enable-zmq --enable-gui --enable-reduce-exports --enable-werror --enable-debug --with-boost=/usr/local/opt/boost"
@@ -296,11 +297,6 @@ jobs:
             export CXX
           fi
 
-          if [ "${{ matrix.config.os }}" = "macos-12" ]; then
-            export CPPFLAGS="-I/usr/local/opt/boost/include -I/usr/local/opt/berkeley-db@4/include"
-            export LDFLAGS="-L/usr/local/opt/boost/lib -L/usr/local/opt/berkeley-db@4/lib"
-          fi
-
           if [[ ${{ matrix.config.os }} = ubuntu* ]]; then
             OUTDIR_PATH="$GITHUB_WORKSPACE/$GITHUB_RUN_NUMBER"
             BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$GITHUB_WORKSPACE --bindir=$OUTDIR_PATH/bin --libdir=$OUTDIR_PATH/lib"
@@ -389,8 +385,8 @@ jobs:
 
           - name: x64-macOS
             id: macOS-nodepends
-            os: macos-12
-            python-version: '3.8'
+            os: macos-13
+            python-version: '3.10'
             packages: berkeley-db@4 boost miniupnpc libnatpmp pkg-config zmq libevent qrencode gmp libsodium
 
           - name: arm64-macOS-latest