Skip to content

Commit bedffd5

Browse files
Merge #1488: ci: Add native macOS arm64 job
218f0cc ci: Add native macOS arm64 job (Hennadii Stepanov) Pull request description: This PR starts using the [new](https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/) M1 macOS runner. The alternative approach might be using a matrix, but it is not trivial to implement. ACKs for top commit: real-or-random: ACK 218f0cc Tree-SHA512: 709e836909fa2a90248f689f4c57192d1daecc53abd3d2d1b8b892a7deb6fdd008bf8f7270ab39da5b0f994d0ea4cf0767dab3a07c6dfc2109a9735af1072f3f
2 parents 4b8d5ee + 218f0cc commit bedffd5

File tree

1 file changed

+59
-3
lines changed

1 file changed

+59
-3
lines changed

.github/workflows/ci.yml

Lines changed: 59 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,10 +591,10 @@ jobs:
591591
run: env
592592
if: ${{ always() }}
593593

594-
macos-native:
595-
name: "x86_64: macOS Monterey"
594+
x86_64-macos-native:
595+
name: "x86_64: macOS Monterey, Valgrind"
596596
# See: https://github.com/actions/runner-images#available-images.
597-
runs-on: macos-12 # Use M1 once available https://github.com/github/roadmap/issues/528
597+
runs-on: macos-12
598598

599599
env:
600600
CC: 'clang'
@@ -650,6 +650,62 @@ jobs:
650650
run: env
651651
if: ${{ always() }}
652652

653+
arm64-macos-native:
654+
name: "ARM64: macOS Sonoma"
655+
# See: https://github.com/actions/runner-images#available-images.
656+
runs-on: macos-14
657+
658+
env:
659+
CC: 'clang'
660+
HOMEBREW_NO_AUTO_UPDATE: 1
661+
HOMEBREW_NO_INSTALL_CLEANUP: 1
662+
WITH_VALGRIND: 'no'
663+
CTIMETESTS: 'no'
664+
665+
strategy:
666+
fail-fast: false
667+
matrix:
668+
env_vars:
669+
- { WIDEMUL: 'int64', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
670+
- { WIDEMUL: 'int128_struct', ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
671+
- { WIDEMUL: 'int128', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
672+
- { WIDEMUL: 'int128', RECOVERY: 'yes' }
673+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes' }
674+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CC: 'gcc' }
675+
- { WIDEMUL: 'int128', RECOVERY: 'yes', ECDH: 'yes', SCHNORRSIG: 'yes', ELLSWIFT: 'yes', CPPFLAGS: '-DVERIFY' }
676+
- BUILD: 'distcheck'
677+
678+
steps:
679+
- name: Checkout
680+
uses: actions/checkout@v4
681+
682+
- name: Install Homebrew packages
683+
run: |
684+
brew install automake libtool gcc
685+
ln -s $(brew --prefix gcc)/bin/gcc-?? /usr/local/bin/gcc
686+
687+
- name: CI script
688+
env: ${{ matrix.env_vars }}
689+
run: ./ci/ci.sh
690+
691+
- run: cat tests.log || true
692+
if: ${{ always() }}
693+
- run: cat noverify_tests.log || true
694+
if: ${{ always() }}
695+
- run: cat exhaustive_tests.log || true
696+
if: ${{ always() }}
697+
- run: cat ctime_tests.log || true
698+
if: ${{ always() }}
699+
- run: cat bench.log || true
700+
if: ${{ always() }}
701+
- run: cat config.log || true
702+
if: ${{ always() }}
703+
- run: cat test_env.log || true
704+
if: ${{ always() }}
705+
- name: CI env
706+
run: env
707+
if: ${{ always() }}
708+
653709
win64-native:
654710
name: ${{ matrix.configuration.job_name }}
655711
# See: https://github.com/actions/runner-images#available-images.

0 commit comments

Comments
 (0)