Skip to content

Commit

Permalink
[GA] Bump standard macOS to macos-13
Browse files Browse the repository at this point in the history
macOS 12 runners are now deprecated and will be removed in December.
Bump the standard macOS runner version to macos-13 accordingly.
  • Loading branch information
Fuzzbawls committed Oct 18, 2024
1 parent d3c1e95 commit 9f1e819
Showing 1 changed file with 10 additions and 14 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 9f1e819

Please sign in to comment.