Skip to content

Commit

Permalink
Merge bitcoin-core/secp256k1#1404: ci: Remove "arm64: macOS Ventura" …
Browse files Browse the repository at this point in the history
…task from Cirrus CI

c2f6435 ci: Add comment about switching macOS to M1 on GHA later (Tim Ruffing)
4a24fae ci: Remove "arm64: macOS Ventura" task from Cirrus CI (Hennadii Stepanov)

Pull request description:

ACKs for top commit:
  hebasto:
    ACK c2f6435
  jonasnick:
    ACK c2f6435

Tree-SHA512: a930f2a58fdf3624d03ffd07f6db236e804100eb9d4320c943a65b5a2afb89a5da82df8e0207b87e0e8f858974af07c876c9e56495246dfd24146dfb3b10b591
  • Loading branch information
jonasnick committed Aug 17, 2023
2 parents 3d05c86 + c2f6435 commit bcffeb1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 32 deletions.
31 changes: 0 additions & 31 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,37 +114,6 @@ task:
- ./ci/cirrus.sh
<< : *CAT_LOGS

task:
name: "arm64: macOS Ventura"
macos_instance:
image: ghcr.io/cirruslabs/macos-ventura-base:latest
env:
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_NO_INSTALL_CLEANUP: 1
# Cirrus gives us a fixed number of 4 virtual CPUs. Not that we even have that many jobs at the moment...
MAKEFLAGS: -j5
env:
ASM: no
WITH_VALGRIND: no
CTIMETESTS: no
CC: clang
matrix:
- env: {WIDEMUL: int64, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
- env: {WIDEMUL: int64, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CC: gcc}
- env: {WIDEMUL: int128_struct, ECMULTGENPRECISION: 2, ECMULTWINDOW: 4}
- env: {WIDEMUL: int128, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes}
- env: {WIDEMUL: int128, RECOVERY: yes, SCHNORRSIG: yes}
- env: {WIDEMUL: int128, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CC: gcc}
- env: {WIDEMUL: int128, RECOVERY: yes, ECDH: yes, SCHNORRSIG: yes, ELLSWIFT: yes, CPPFLAGS: -DVERIFY}
- env: {BUILD: distcheck}
brew_script:
- brew install automake libtool gcc
- ln -s /opt/homebrew/bin/gcc-?? /opt/homebrew/bin/gcc
test_script:
- ./ci/cirrus.sh
<< : *CAT_LOGS
<< : *CREDITS

task:
name: "s390x (big-endian): Linux (Debian stable, QEMU)"
<< : *LINUX_CONTAINER
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
macos-native:
name: "x86_64: macOS Ventura"
# See: https://github.com/actions/runner-images#available-images.
runs-on: macos-13
runs-on: macos-13 # Use M1 once available https://github.com/github/roadmap/issues/528

env:
ASM: 'no'
Expand Down

0 comments on commit bcffeb1

Please sign in to comment.