aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2024-04-24 09:42:09 -0700
committerEli Schwartz <eschwartz93@gmail.com>2024-04-25 16:07:17 -0400
commit869bb7bc423db0bd176eab6d0c8662bfe7be74bf (patch)
tree9eba93f36de6a0624f13f24a1501f34bb360fbb3
parent3a94aef38dd5e0b044836e37c432fc897d38e405 (diff)
downloadmeson-869bb7bc423db0bd176eab6d0c8662bfe7be74bf.zip
meson-869bb7bc423db0bd176eab6d0c8662bfe7be74bf.tar.gz
meson-869bb7bc423db0bd176eab6d0c8662bfe7be74bf.tar.bz2
CI/MacOS: switch the Qt4 job to run on an Intel Mac
Qt4 doesn't seem to work on Apple Silicon because OpenSSL 1.0 (a requirement for Qt4) doesn't build on it correctly, trying to use X86 assembly.
-rw-r--r--.github/workflows/macos.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index cd58f9d..4eb1870 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -126,7 +126,9 @@ jobs:
verbose: true
Qt4macos:
- runs-on: macos-latest
+ # This job only works on Intel Macs, because OpenSSL 1.0 doesn't build on
+ # Apple ARM
+ runs-on: macos-13
env:
HOMEBREW_NO_AUTO_UPDATE: 1
steps: