Skip to content

Commit 947f843

Browse files
CI: Update macOS build runners
macOS 13 is no longer supported by Apple/Homebrew.
1 parent 3110684 commit 947f843

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

.github/actions/install-dependencies/install-dependencies.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# ubuntu-22.04: Qt 5 + GTK 2
66
# ubuntu-24.04: Qt 6 + GTK 3
77
# Windows: Qt 6 + GTK 2
8-
# macOS 13: Qt 5 - GTK
9-
# macOS 15: Qt 6 - GTK
8+
# macOS 15: Qt 5 - GTK
9+
# macOS 26: Qt 6 - GTK
1010

1111
os=$(tr '[:upper:]' '[:lower:]' <<< "$1")
1212
build_system=$(tr '[:upper:]' '[:lower:]' <<< "$2")
@@ -50,11 +50,11 @@ case "$os" in
5050
fi
5151
;;
5252

53-
macos-13)
53+
macos-15*)
5454
if [ "$build_system" = 'meson' ]; then
5555
brew update -q && brew install $macos_packages qt@5 meson
5656
else
57-
brew update -q && brew install $macos_packages qt@5 automake
57+
brew update -q && brew install $macos_packages qt@5 automake libiconv
5858
fi
5959
;;
6060

.github/actions/run-action/run-action.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# ubuntu-22.04: Qt 5 + GTK 2
66
# ubuntu-24.04: Qt 6 + GTK 3
77
# Windows: Qt 6 + GTK 2
8-
# macOS 13: Qt 5 - GTK
9-
# macOS 15: Qt 6 - GTK
8+
# macOS 15: Qt 5 - GTK
9+
# macOS 26: Qt 6 - GTK
1010

1111
action=$(tr '[:upper:]' '[:lower:]' <<< "$1")
1212
os=$(tr '[:upper:]' '[:lower:]' <<< "$2")
@@ -40,14 +40,17 @@ case "$action" in
4040
fi
4141
;;
4242

43-
macos-13)
43+
macos-15*)
4444
export PATH="/usr/local/opt/qt@5/bin:$PATH"
4545
export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
4646

4747
if [ "$build_system" = 'meson' ]; then
4848
meson setup build -D qt5=true -D gtk=false -D mac-media-keys=true
4949
else
50-
autoreconf -I "/usr/local/share/gettext/m4" && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
50+
export LDFLAGS="-L/usr/local/opt/libiconv/lib"
51+
export CPPFLAGS="-I/usr/local/opt/libiconv/include"
52+
autoreconf -I "/usr/local/share/gettext/m4" &&
53+
./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
5154
fi
5255
;;
5356

@@ -60,7 +63,8 @@ case "$action" in
6063
else
6164
export LDFLAGS="-L/opt/homebrew/opt/libiconv/lib"
6265
export CPPFLAGS="-I/opt/homebrew/opt/libiconv/include"
63-
autoreconf -I "/opt/homebrew/opt/gettext/share/gettext/m4" && ./configure --disable-gtk --enable-mac-media-keys
66+
autoreconf -I "/opt/homebrew/opt/gettext/share/gettext/m4" &&
67+
./configure --disable-gtk --enable-mac-media-keys
6468
fi
6569
;;
6670

.github/workflows/c-cpp.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-22.04, ubuntu-24.04,
14-
macos-13, macos-15,
14+
macos-15-intel, macos-26,
1515
windows-2022]
1616
build-system: [autotools, meson]
1717
exclude:
18-
- os: macos-15
18+
- os: macos-26
1919
build-system: autotools
2020
fail-fast: false
2121
runs-on: ${{ matrix.os }}
2222

2323
steps:
2424
- name: Checkout audacious-plugins
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v5
2626

2727
- name: Checkout audacious
28-
uses: actions/checkout@v4
28+
uses: actions/checkout@v5
2929
with:
3030
repository: audacious-media-player/audacious
3131
path: audacious

0 commit comments

Comments
 (0)