CI: Support macOS 15 build with autotools

Use also always Qt 5 on macOS 13 and Qt 6 on macOS 15.
radioactiveman · Jan 6, 2025 · 6a1c763 · 6a1c763
1 parent ba69553
commit 6a1c763
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/.github/actions/install-dependencies/install-dependencies.sh b/.github/actions/install-dependencies/install-dependencies.sh
@@ -6,8 +6,8 @@
 # ubuntu-22.04:      Qt 5 + GTK 3
 # ubuntu-24.04:      Qt 6 + GTK 3
 # Windows:           Qt 6 + GTK 2
-# macOS (Autotools): Qt 5 - GTK
-# macOS (Meson):     Qt 6 - GTK
+# macOS 13:          Qt 5 - GTK
+# macOS 15:          Qt 6 - GTK
 
 os=$(tr '[:upper:]' '[:lower:]' <<< "$1")
 build_system=$(tr '[:upper:]' '[:lower:]' <<< "$2")
@@ -58,11 +58,19 @@ case "$os" in
     fi
     ;;
 
+  macos-13)
+    if [ "$build_system" = 'meson' ]; then
+      brew install $macos_packages qt@5 meson
+    else
+      brew install $macos_packages qt@5 automake
+    fi
+    ;;
+
   macos*)
     if [ "$build_system" = 'meson' ]; then
       brew install $macos_packages qt@6 meson
     else
-      brew install $macos_packages qt@5 automake
+      brew install $macos_packages qt@6 automake libiconv
     fi
     ;;
 

diff --git a/.github/actions/run-action/run-action.sh b/.github/actions/run-action/run-action.sh
@@ -6,8 +6,8 @@
 # ubuntu-22.04:      Qt 5 + GTK 3
 # ubuntu-24.04:      Qt 6 + GTK 3
 # Windows:           Qt 6 + GTK 2
-# macOS (Autotools): Qt 5 - GTK
-# macOS (Meson):     Qt 6 - GTK
+# macOS 13:          Qt 5 - GTK
+# macOS 15:          Qt 6 - GTK
 
 action=$(tr '[:upper:]' '[:lower:]' <<< "$1")
 os=$(tr '[:upper:]' '[:lower:]' <<< "$2")
@@ -49,13 +49,25 @@ case "$action" in
         fi
         ;;
 
+      macos-13)
+        export PATH="/usr/local/opt/qt@5/bin:$PATH"
+        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+        if [ "$build_system" = 'meson' ]; then
+          meson setup build -D qt5=true -D gtk=false -D mac-media-keys=true
+        else
+          ./autogen.sh && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
+        fi
+        ;;
+
       macos*)
+        export PATH="/opt/homebrew/opt/qt@6/bin:$PATH"
+        export PKG_CONFIG_PATH="/opt/homebrew/opt/qt@6/libexec/lib/pkgconfig:$PKG_CONFIG_PATH"
+
         if [ "$build_system" = 'meson' ]; then
           meson setup build -D gtk=false -D mac-media-keys=true
         else
-          export PATH="/usr/local/opt/qt@5/bin:$PATH"
-          export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig:$PKG_CONFIG_PATH"
-          ./autogen.sh && ./configure --enable-qt5 --disable-gtk --enable-mac-media-keys
+          ./autogen.sh && ./configure --disable-gtk --enable-mac-media-keys
         fi
         ;;
 

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -14,9 +14,6 @@ jobs:
              macos-13, macos-15,
              windows-2022]
         build-system: [autotools, meson]
-        exclude:
-          - os: macos-15
-            build-system: autotools
       fail-fast: false
     runs-on: ${{ matrix.os }}