Skip to content

Commit 89723e2

Browse files
thiagomacieirasjlongland
authored andcommitted
CI: Get Homebrew to use a bottle (precompiled) Qt
Homebrew no longer carries precompiled versions of Qt for macos-11, so switch to macos-13, the last on x86 CPUs (so we can still run Valgrind). It's also going away after the end of June. Signed-off-by: Thiago Macieira <[email protected]>
1 parent 8907f20 commit 89723e2

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ jobs:
6767
}
6868
]
6969
include:
70-
- os: macos-11
70+
- os: macos-13
7171
build_cfg: { "name": "clang",
7272
"flags":
7373
'{ "QMAKESPEC": "macx-clang",
7474
"CFLAGS": "-Oz",
7575
"QMAKEFLAGS": "-config debug",
7676
"MAKEFLAGS": "-s",
7777
"TESTARGS": "-silent",
78-
"PATH": "/usr/local/opt/qt5/bin:$PATH"
78+
"PATH": "/usr/local/opt/qt/bin:$PATH"
7979
}'
8080
}
8181

@@ -102,7 +102,7 @@ jobs:
102102
qtbase5-dev
103103
104104
- name: install macOS software
105-
if: matrix.os == 'macos-11'
105+
if: runner.os == 'macOS'
106106
run: |
107107
# Doxygen 1.9.7 is broken with ifdefs again, install 1.9.4 which works.
108108
wget https://raw.githubusercontent.com/Homebrew/homebrew-core/41828ee36b96e35b63b2a4c8cfc2df2c3728944a/Formula/doxygen.rb
@@ -113,7 +113,7 @@ jobs:
113113
# Valgrind takes a long time to build, so put in a separate step
114114
# to make it easy to disable.
115115
- name: install macOS valgrind
116-
if: matrix.os == 'macos-11'
116+
if: runner.os == 'macOS'
117117
run: |
118118
# 3 cores on CI runners, so use make -j6 for homebrew.
119119
export HOMEBREW_MAKE_JOBS=6

0 commit comments

Comments
 (0)