From f803c5817442c0835387536eacd2801a6b9705dc Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Wed, 31 Jan 2024 19:32:16 +0000 Subject: [PATCH] a fix --- .github/workflows/ci.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49b74f0d30..cc263b1a7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -601,8 +601,10 @@ jobs: # See: https://github.com/actions/runner-images#available-images. - name: 'x86_64: macOS Monterey, Valgrind' runner: 'macos-12' + env_var: { WITH_VALGRIND: 'yes' } - name: 'arm64: macOS Sonoma' runner: 'macos-14' + env_var: { WITH_VALGRIND: 'no' } env_vars: - { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' } - { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 } @@ -615,12 +617,15 @@ jobs: - { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY', CTIMETESTS: 'no' } - BUILD: 'distcheck' + env: + WITH_VALGRIND: ${{ runner.arch == 'X64' && 'yes' || 'no' }} + steps: - name: Checkout uses: actions/checkout@v4 - - name: Architecture - run: uname -m + # - name: Architecture + # run: uname -m - name: Install Homebrew packages run: | @@ -628,7 +633,7 @@ jobs: ln -s $(brew --prefix gcc)/bin/gcc-?? /usr/local/bin/gcc - name: Install and cache Valgrind - if: ${{ env.RUNNER_ARCH == 'X64' }} + if: ${{ runner.arch == 'X64' }} uses: ./.github/actions/install-homebrew-valgrind - name: CI script