Skip to content

Commit

Permalink
Restore macos x86_64 target
Browse files Browse the repository at this point in the history
Github runner macos-latest is now arm64
actions/runner-images#9741
  • Loading branch information
exquo committed Aug 21, 2024
1 parent 114198e commit 54c12be
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ This means that the resulting binaries can be used with confidence that they wer
- `x86_64-linux-gnu`
Most desktop linuxes.
Supports `glibc` versions less recent than that required for the upstream releases, which are built on the latest Ubuntu (see [signal-cli#643](https://github.com/AsamK/signal-cli/issues/643)).
- `aarch64-apple-darwin`
MacOS, ARM64.
- `x86_64-pc-windows`
Windows, 64 bit.
- `x86_64-apple-darwin`
MacOS, Intel 64 bit.
- `aarch64-apple-darwin`
MacOS, ARM64.
- `aarch64-linux-gnu`
Raspberry Pi 3,4; Pine A64; many SoC.
- `armv7-linux-gnueabihf`
Expand Down
6 changes: 4 additions & 2 deletions generate_matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,10 @@
},
"macos": {
"runner": "macos-latest",
"triple": "aarch64-apple-darwin",
# macos-latest is arm64: https://github.com/actions/runner-images
"lib-prefix": "lib",
"lib-suffix": ".dylib",
"triple": "x86_64-apple-darwin",
"install-cmd": "brew install",
"req-pkg": "protobuf",
},
Expand Down Expand Up @@ -106,7 +107,8 @@ def cross_template(arch, subarch="", env="gnu", vendor="unknown", sys_os="linux"
cross_template("aarch64"),
cross_template("arm", "v7", "gnueabihf"),
cross_template("i686"),
hosts["macos"] | {"target": "aarch64-apple-darwin"},
hosts["macos"],
hosts["macos"] | {"target": "x86_64-apple-darwin"},
hosts["windows"],
]

Expand Down

0 comments on commit 54c12be

Please sign in to comment.