Skip to content

Commit c7c3fd4

Browse files
PatTheMavRytoEX
PatTheMav
authored and
RytoEX
committed
CI: Force-remove pkg-config on macOS runners and install pkgconf
Homebrew has effectively deprecated the pkg-config formula and instead aliased pkgconf to that name. Installing pkg-config via the Brewfile thus leads to Homebrew attempting to install pkgconf instead, which will fail because the (older) pkg-config formula is installed by default on macOS runners.
1 parent 994fbc4 commit c7c3fd4

File tree

3 files changed

+56
-51
lines changed

3 files changed

+56
-51
lines changed

‎.Brewfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ brew "libtool"
77
brew "meson"
88
brew "nasm"
99
brew "ninja"
10-
brew "pkg-config"
10+
brew "pkgconf"

‎.github/workflows/main.yaml‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
ffmpeg-macos-build:
5757
name: Build FFmpeg for macOS
58-
runs-on: macos-14
58+
runs-on: macos-15
5959
needs: pre-checks
6060
strategy:
6161
fail-fast: true
@@ -78,19 +78,20 @@ jobs:
7878
- name: Setup Environment
7979
id: setup
8080
run: |
81-
print '::group::Enable Xcode 15.2'
82-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
81+
print '::group::Enable Xcode 16.1'
82+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
8383
print '::endgroup::'
8484
85-
local -a to_remove=()
86-
87-
for formula (llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile \
85+
local -a unwanted_formulas=(llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile \
8886
libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin \
89-
sbt libxft libxcb) {
90-
if [[ -d /usr/local/opt/${formula} ]] to_remove+=(${formula})
87+
sbt libxft libxcb [email protected])
88+
89+
local -a remove_formulas=()
90+
for formula (${unwanted_formulas}) {
91+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
9192
}
9293
93-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
94+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
9495
9596
local -r date_string=$(date +"%Y-%m-%d")
9697
local -r target='${{ matrix.target }}'
@@ -190,7 +191,7 @@ jobs:
190191

191192
ffmpeg-package-universal:
192193
name: Build FFmpeg (Universal)
193-
runs-on: macos-14
194+
runs-on: macos-15
194195
needs: [pre-checks, ffmpeg-macos-build]
195196
steps:
196197
- name: Checkout
@@ -214,7 +215,7 @@ jobs:
214215

215216
macos-build:
216217
name: Build macOS Dependencies
217-
runs-on: macos-14
218+
runs-on: macos-15
218219
needs: pre-checks
219220
strategy:
220221
fail-fast: true
@@ -238,18 +239,18 @@ jobs:
238239
id: setup
239240
run: |
240241
: Setup Environment
241-
242-
print '::group::Enable Xcode 15.2'
243-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
242+
print '::group::Enable Xcode 16.1'
243+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
244244
print '::endgroup::'
245245
246-
to_remove=()
246+
local -a unwanted_formulas=(llvm gcc [email protected])
247247
248-
for formula (llvm gcc) {
249-
if [[ -d /usr/local/opt/"${formula}" ]] to_remove+=(${formula})
248+
local -a remove_formulas=()
249+
for formula (${unwanted_formulas}) {
250+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
250251
}
251252
252-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
253+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
253254
254255
local -r date_string=$(date +"%Y-%m-%d")
255256
local -r target='${{ matrix.target }}'
@@ -304,7 +305,7 @@ jobs:
304305

305306
macos-package-universal:
306307
name: Build macOS Dependencies (Universal)
307-
runs-on: macos-14
308+
runs-on: macos-15
308309
needs: [pre-checks, macos-build]
309310
steps:
310311
- name: Checkout
@@ -328,7 +329,7 @@ jobs:
328329

329330
macos-qt6-build:
330331
name: Build Qt6 (macOS)
331-
runs-on: macos-14
332+
runs-on: macos-15
332333
needs: pre-checks
333334
defaults:
334335
run:
@@ -341,17 +342,18 @@ jobs:
341342
id: setup
342343
run: |
343344
: Setup Environment
344-
print '::group::Enable Xcode 15.2'
345-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
345+
print '::group::Enable Xcode 16.1'
346+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
346347
print '::endgroup::'
347348
348-
local -a to_remove=()
349+
local -a unwanted_formulas=(llvm gcc [email protected])
349350
350-
for formula (llvm gcc) {
351-
if [[ -d /usr/local/opt/"${formula}" ]] to_remove+=(${formula})
351+
local -a remove_formulas=()
352+
for formula (${unwanted_formulas}) {
353+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
352354
}
353355
354-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
356+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
355357
356358
local -r date_string=$(date +"%Y-%m-%d")
357359
artifact_name="qt6-macos-universal-${{ needs.pre-checks.outputs.shortHash }}"
@@ -403,7 +405,7 @@ jobs:
403405

404406
macos-qt6-package:
405407
name: Create macOS Qt6 (${{ matrix.target }})
406-
runs-on: macos-14
408+
runs-on: macos-15
407409
strategy:
408410
fail-fast: true
409411
matrix:

‎.github/workflows/scheduled.yaml‎

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
7676
ffmpeg-macos-build:
7777
name: Build FFmpeg for macOS
78-
runs-on: macos-14
78+
runs-on: macos-15
7979
needs: cache-cleanup
8080
strategy:
8181
fail-fast: true
@@ -99,19 +99,20 @@ jobs:
9999
id: setup
100100
run: |
101101
: Setup Environment
102-
print '::group::Enable Xcode 15.2'
103-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
102+
print '::group::Enable Xcode 16.1'
103+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
104104
print '::endgroup::'
105105
106-
local -a to_remove=()
107-
108-
for formula (llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile \
106+
local -a unwanted_formulas=(llvm gcc postgresql openjdk sox libsndfile flac libvorbis opusfile \
109107
libogg composer php gd freetype fontconfig webp libpng lame libtiff opus kotlin \
110-
sbt libxft libxcb) {
111-
if [[ -d /usr/local/opt/${formula} ]] to_remove+=(${formula})
108+
sbt libxft libxcb [email protected])
109+
110+
local -a remove_formulas=()
111+
for formula (${unwanted_formulas}) {
112+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
112113
}
113114
114-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
115+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
115116
116117
local -r date_string=$(date +"%Y-%m-%d")
117118
print "ccacheDate=${date_string}" >> $GITHUB_OUTPUT
@@ -160,7 +161,7 @@ jobs:
160161

161162
macos-build:
162163
name: Build macOS Dependencies
163-
runs-on: macos-14
164+
runs-on: macos-15
164165
needs: cache-cleanup
165166
strategy:
166167
fail-fast: true
@@ -184,17 +185,18 @@ jobs:
184185
id: setup
185186
run: |
186187
: Setup Environment
187-
print '::group::Enable Xcode 15.2'
188-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
188+
print '::group::Enable Xcode 16.1'
189+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
189190
print '::endgroup::'
190191
191-
to_remove=()
192+
local -a unwanted_formulas=(llvm gcc [email protected])
192193
193-
for formula (llvm gcc) {
194-
if [[ -d /usr/local/opt/"${formula}" ]] to_remove+=(${formula})
194+
local -a remove_formulas=()
195+
for formula (${unwanted_formulas}) {
196+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
195197
}
196198
197-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
199+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
198200
199201
local -r date_string=$(date +"%Y-%m-%d")
200202
print "ccacheDate=${date_string}" >> $GITHUB_OUTPUT
@@ -291,7 +293,7 @@ jobs:
291293

292294
macos-qt6-build:
293295
name: Build Qt6 (macOS)
294-
runs-on: macos-14
296+
runs-on: macos-15
295297
needs: cache-cleanup
296298
defaults:
297299
run:
@@ -304,17 +306,18 @@ jobs:
304306
id: setup
305307
run: |
306308
: Setup Environment
307-
print '::group::Enable Xcode 15.2'
308-
sudo xcode-select --switch /Applications/Xcode_15.2.app/Contents/Developer
309+
print '::group::Enable Xcode 16.1'
310+
sudo xcode-select --switch /Applications/Xcode_16.1.0.app/Contents/Developer
309311
print '::endgroup::'
310312
311-
local -a to_remove=()
313+
local -a unwanted_formulas=(llvm gcc pkg-config)
312314
313-
for formula (llvm gcc) {
314-
if [[ -d /usr/local/opt/"${formula}" ]] to_remove+=(${formula})
315+
local -a remove_formulas=()
316+
for formula (${unwanted_formulas}) {
317+
if [[ -d ${HOMEBREW_PREFIX}/Cellar/${formula} ]] remove_formulas+=(${formula})
315318
}
316319
317-
if (( #to_remove )) brew uninstall --ignore-dependencies ${to_remove}
320+
if (( #remove_formulas )) brew uninstall --ignore-dependencies ${remove_formulas}
318321
319322
local -r date_string=$(date +"%Y-%m-%d")
320323
print "ccacheDate=${date_string}" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)