diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d8fdb4a16e..c9621dc8aa9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -84,7 +84,7 @@ jobs: git rebase --exec "git merge --no-commit origin/${GITHUB_BASE_REF} && ./.github/ci-test-each-commit-exec.sh && git reset --hard" ${{ env.TEST_BASE }} macos-native-arm64: - name: ${{ matrix.job-name }} + name: 'macOS 14 native, arm64, no depends, sqlite only, gui' # Use any image to support the xcode-select below, but hardcode version to avoid silent upgrades (and breaks). # See: https://github.com/actions/runner-images#available-images. runs-on: macos-14 @@ -98,18 +98,6 @@ jobs: timeout-minutes: 120 - strategy: - fail-fast: false - matrix: - job-type: [standard, fuzz] - include: - - job-type: standard - file-env: './ci/test/00_setup_env_mac_native.sh' - job-name: 'macOS 14 native, arm64, no depends, sqlite only, gui' - - job-type: fuzz - file-env: './ci/test/00_setup_env_mac_native_fuzz.sh' - job-name: 'macOS 14 native, arm64, fuzz' - env: DANGER_RUN_CI_ON_HOST: 1 BASE_ROOT_DIR: ${{ github.workspace }} @@ -143,13 +131,13 @@ jobs: uses: actions/cache/restore@v4 with: path: ${{ env.CCACHE_DIR }} - key: ${{ github.job }}-${{ matrix.job-type }}-ccache-${{ github.run_id }} - restore-keys: ${{ github.job }}-${{ matrix.job-type }}-ccache- + key: ${{ github.job }}-ccache-${{ github.run_id }} + restore-keys: ${{ github.job }}-ccache- - name: CI script run: ./ci/test_run_all.sh env: - FILE_ENV: ${{ matrix.file-env }} + FILE_ENV: './ci/test/00_setup_env_mac_native.sh' - name: Save Ccache cache uses: actions/cache/save@v4 @@ -157,7 +145,7 @@ jobs: with: path: ${{ env.CCACHE_DIR }} # https://github.com/actions/cache/blob/main/tips-and-workarounds.md#update-a-cache - key: ${{ github.job }}-${{ matrix.job-type }}-ccache-${{ github.run_id }} + key: ${{ github.job }}-ccache-${{ github.run_id }} windows-native-dll: name: ${{ matrix.job-name }} diff --git a/ci/test/00_setup_env_mac_native.sh b/ci/test/00_setup_env_mac_native.sh index e01a56895bf..bc42fa3deb6 100755 --- a/ci/test/00_setup_env_mac_native.sh +++ b/ci/test/00_setup_env_mac_native.sh @@ -11,7 +11,11 @@ export LC_ALL=C.UTF-8 export PIP_PACKAGES="--break-system-packages zmq" export GOAL="install" export CMAKE_GENERATOR="Ninja" -export BITCOIN_CONFIG="-DBUILD_GUI=ON -DWITH_ZMQ=ON -DREDUCE_EXPORTS=ON" +export BITCOIN_CONFIG="\ + -DBUILD_GUI=ON -DWITH_ZMQ=ON -DREDUCE_EXPORTS=ON \ + -DBUILD_FUZZ_BINARY=ON -DCMAKE_BUILD_TYPE=Debug -DAPPEND_CFLAGS='-O2 -g' -DAPPEND_CXXFLAGS='-O2 -g' \ +" +export RUN_FUZZ_TESTS=true export CI_OS_NAME="macos" export NO_DEPENDS=1 export OSX_SDK="" diff --git a/ci/test/00_setup_env_mac_native_fuzz.sh b/ci/test/00_setup_env_mac_native_fuzz.sh deleted file mode 100755 index cacf2423ac3..00000000000 --- a/ci/test/00_setup_env_mac_native_fuzz.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright (c) The Bitcoin Core developers -# Distributed under the MIT software license, see the accompanying -# file COPYING or http://www.opensource.org/licenses/mit-license.php. - -export LC_ALL=C.UTF-8 - -export CMAKE_GENERATOR="Ninja" -export BITCOIN_CONFIG="-DBUILD_FOR_FUZZING=ON" -export CI_OS_NAME="macos" -export NO_DEPENDS=1 -export OSX_SDK="" -export RUN_UNIT_TESTS=false -export RUN_FUNCTIONAL_TESTS=false -export RUN_FUZZ_TESTS=true -export GOAL="all"