test2

Fuzzbawls · Oct 17, 2024 · 52be6c8 · 52be6c8
1 parent 784def0
commit 52be6c8
Showing 1 changed file with 23 additions and 9 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -234,11 +234,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"
@@ -255,6 +256,18 @@ jobs:
             cxx: clang++
             BITCOIN_CONFIG: "--enable-zmq --enable-gui --enable-reduce-exports --enable-werror --enable-debug --with-boost=/opt/homebrew/opt/boost"
 
+          - name: arm64-macOS-latest
+            id: macOS-nodepends-arm
+            os: macos-15
+            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=/opt/homebrew/opt/boost"
+
     steps:
       - name: Get Source
         uses: actions/checkout@v4
@@ -304,11 +317,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"
@@ -397,8 +405,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
@@ -407,6 +415,12 @@ jobs:
             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-arm
+            os: macos-15
+            python-version: '3.10'
+            packages: berkeley-db@4 boost miniupnpc libnatpmp pkg-config zmq libevent qrencode gmp libsodium
+
     steps:
       - name: Initialize Python
         uses: actions/setup-python@v5