diff --git a/.github/actions/install-homebrew-valgrind/action.yml b/.github/actions/install-homebrew-valgrind/action.yml deleted file mode 100644 index ce10eb2686..0000000000 --- a/.github/actions/install-homebrew-valgrind/action.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: "Install Valgrind" -description: "Install Homebrew's Valgrind package and cache it." -runs: - using: "composite" - steps: - - run: | - brew tap LouisBrunner/valgrind - brew fetch --HEAD LouisBrunner/valgrind/valgrind - echo "CI_HOMEBREW_CELLAR_VALGRIND=$(brew --cellar valgrind)" >> "$GITHUB_ENV" - shell: bash - - - run: | - sw_vers > valgrind_fingerprint - brew --version >> valgrind_fingerprint - git -C "$(brew --cache)/valgrind--git" rev-parse HEAD >> valgrind_fingerprint - cat valgrind_fingerprint - shell: bash - - - uses: actions/cache@v4 - id: cache - with: - path: ${{ env.CI_HOMEBREW_CELLAR_VALGRIND }} - key: ${{ github.job }}-valgrind-${{ hashFiles('valgrind_fingerprint') }} - - - if: steps.cache.outputs.cache-hit != 'true' - run: | - brew install --HEAD LouisBrunner/valgrind/valgrind - shell: bash - - - if: steps.cache.outputs.cache-hit == 'true' - run: | - brew link valgrind - shell: bash diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9783251d65..056da4c104 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -504,58 +504,6 @@ jobs: uses: ./.github/actions/print-logs if: ${{ !cancelled() }} - x86_64-macos-native: - name: "x86_64: macOS Ventura, Valgrind" - # See: https://github.com/actions/runner-images#available-images. - runs-on: macos-13 - - env: - CC: 'clang' - HOMEBREW_NO_AUTO_UPDATE: 1 - HOMEBREW_NO_INSTALL_CLEANUP: 1 - SYMBOL_CHECK: 'no' - - strategy: - fail-fast: false - matrix: - env_vars: - - { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' } - - { WIDEMUL: 'int128_struct', ECMULTGENKB: 2, ECMULTWINDOW: 4 } - - { WIDEMUL: 'int128', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' } - - { WIDEMUL: 'int128', RECOVERY: 'yes' } - - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes' } - - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' } - - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 } - - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc', WRAPPER_CMD: 'valgrind --error-exitcode=42', SECP256K1_TEST_ITERS: 2 } - - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', EXTRAKEYS: 'yes', SCHNORRSIG: 'yes', MUSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' } - - BUILD: 'distcheck' - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install Homebrew packages - run: | - brew install --quiet automake libtool gcc - ln -s $(brew --prefix gcc)/bin/gcc-?? /usr/local/bin/gcc - - - name: Install and cache Valgrind - uses: ./.github/actions/install-homebrew-valgrind - - - name: CI script - env: ${{ matrix.env_vars }} - run: ./ci/ci.sh - - - name: Symbol check - run: | - python3 --version - python3 -m pip install lief - python3 ./tools/symbol-check.py .libs/libsecp256k1.dylib - - - name: Print logs - uses: ./.github/actions/print-logs - if: ${{ !cancelled() }} - arm64-macos-native: name: "ARM64: macOS Sonoma" # See: https://github.com/actions/runner-images#available-images.