Skip to content

Commit

Permalink
Merge #2942: [GA] Bump standard macOS runners to macos-13
Browse files Browse the repository at this point in the history
44e38f4 [GA] Use python 3.12 for macos-14 arm64 runners (Fuzzbawls)
0c395d4 [GA] Bump standard macOS to macos-13 (Fuzzbawls)

Pull request description:

  GA had deprecated `macos-12` runners and will be removing them in December.

  This migrates our current `macos-12` runners to use `macos-13`.

  The second commit is added because due to GA removing support for python 3.9 and 3.10 in their macos arm64 based runners later this month due to a dependency mismatch with their packaging systems. We currently use arm64 based `macos-14` runners.

ACKs for top commit: 44e38f4
  panleone:
    utACK 44e38f4
  Duddino:
    utACK 44e38f4
  Liquid369:
    utACK 44e38f4

Tree-SHA512: 6d10c2255ac6bf6f24df98894c0cdc8e9b45ee3449c7ca7c2b78a22798f47845108b19cd0c4765aafeb11f85733ae6092d6023b033af509f9276e332b3d740d6
  • Loading branch information
Fuzzbawls committed Nov 6, 2024
2 parents 717728b + 44e38f4 commit a32071f
Showing 1 changed file with 14 additions and 18 deletions.
32 changes: 14 additions & 18 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,16 @@ 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
python-version: '3.10'
python-version: '3.12'
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@14)/bin/clang
Expand Down Expand Up @@ -226,19 +226,20 @@ 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"

- name: arm64-macOS-latest
id: macOS-nodepends-latest
os: macos-14
python-version: '3.10'
python-version: '3.12'
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
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,14 +385,14 @@ 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
id: macOS-nodepends-latest
os: macos-14
python-version: '3.10'
python-version: '3.12'
packages: berkeley-db@4 boost miniupnpc libnatpmp pkg-config zmq libevent qrencode gmp libsodium

steps:
Expand Down Expand Up @@ -775,7 +771,7 @@ jobs:

- name: x86_64 macOS [Full Functional Tests]
id: macos-x86_64-tests
os: macos-12
os: macos-13
host: x86_64-apple-darwin16
packages: None
test_runner_extra: "--all --exclude feature_dbcrash"
Expand Down

0 comments on commit a32071f

Please sign in to comment.