Add CI tests for macos-14 and macos-15

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Nov 10, 2024 · 8eda153 · 8eda153
1 parent e0a81ba
commit 8eda153
Show file tree

Hide file tree

Showing 4 changed files with 106 additions and 40 deletions.
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 11
+  CACHE_VERSION: 12
   DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_TESTS: 1
 
@@ -13,15 +13,6 @@ jobs:
     strategy:
       matrix:
         include:
-          # macos 12
-          - target: macos
-            os: macos-12
-          - target: macos-10.15
-            os: macos-12
-          - target: macos-universal
-            os: macos-12
-          - target: macos-universal-10.15
-            os: macos-12
           # macos 13
           - target: macos
             os: macos-13
@@ -31,6 +22,24 @@ jobs:
             os: macos-13
           - target: macos-universal-10.15
             os: macos-13
+          # macos 14
+          - target: macos
+            os: macos-14
+          - target: macos-10.15
+            os: macos-14
+          - target: macos-universal
+            os: macos-14
+          - target: macos-universal-10.15
+            os: macos-14
+          # macos 15
+          - target: macos
+            os: macos-15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian:11
           - target: linux-aarch64
             container: debian:11
@@ -169,15 +178,33 @@ jobs:
     strategy:
       matrix:
         include:
-          # macos 12
+          # macos 13
+          - target: macos
+            os: macos-13
+          - target: macos-10.15
+            os: macos-13
+          - target: macos-universal
+            os: macos-13
+          - target: macos-universal-10.15
+            os: macos-13
+          # macos 14
           - target: macos
-            os: macos-12
+            os: macos-14
           - target: macos-10.15
-            os: macos-12
+            os: macos-14
           - target: macos-universal
-            os: macos-12
+            os: macos-14
           - target: macos-universal-10.15
-            os: macos-12
+            os: macos-14
+          # macos 15
+          - target: macos
+            os: macos-15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian:11
           - target: linux-aarch64
             container: debian:11
@@ -328,15 +355,6 @@ jobs:
     strategy:
       matrix:
         include:
-          # macos 12
-          - target: macos
-            os: macos-12
-          - target: macos-10.15
-            os: macos-12
-          - target: macos-universal
-            os: macos-12
-          - target: macos-universal-10.15
-            os: macos-12
           # macos 13
           - target: macos
             os: macos-13
@@ -346,6 +364,24 @@ jobs:
             os: macos-13
           - target: macos-universal-10.15
             os: macos-13
+          # macos 14
+          - target: macos
+            os: macos-14
+          - target: macos-10.15
+            os: macos-14
+          - target: macos-universal
+            os: macos-14
+          - target: macos-universal-10.15
+            os: macos-14
+          # macos 15
+          - target: macos
+            os: macos-15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian:11
           - target: linux-aarch64
             container: debian:11
@@ -475,15 +511,27 @@ jobs:
     strategy:
       matrix:
         include:
-          # macos 12
-          - target: macos
-            os: macos-12
+          # macos 13
           - target: macos-10.15
-            os: macos-12
+            os: macos-13
           - target: macos-universal
-            os: macos-12
+            os: macos-13
           - target: macos-universal-10.15
-            os: macos-12
+            os: macos-13
+          # macos 14
+          - target: macos-10.15
+            os: macos-14
+          - target: macos-universal
+            os: macos-14
+          - target: macos-universal-10.15
+            os: macos-14
+          # macos 15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian:11
           - target: linux-aarch64
             container: debian:11
@@ -681,7 +729,7 @@ jobs:
       matrix:
         include:
           - target: macos-universal
-            os: macos-12
+            os: macos-13
           - target: win32
             container: debian:12
             os: ubuntu-latest
@@ -737,16 +785,21 @@ jobs:
     strategy:
       matrix:
         include:
-          # macos 12
-          - target: macos-10.15
-            os: macos-12
-          - target: macos-universal-10.15
-            os: macos-12
           # macos 13
           - target: macos-10.15
             os: macos-13
           - target: macos-universal-10.15
             os: macos-13
+          # macos 14
+          - target: macos-10.15
+            os: macos-14
+          - target: macos-universal-10.15
+            os: macos-14
+          # macos 15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian 11
           - target: linux-x86_64
             container: debian:11

diff --git a/bootstrap-common.sh b/bootstrap-common.sh
@@ -294,6 +294,8 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # pkgconfig
 
+export EXTRA_CFLAGS="-Wno-int-conversion"
+
 download pkg-config "${PKG_CONFIG_VERSION}" "${PKG_CONFIG_URL}"
 build_host_autoconf pkg-config "${PKG_CONFIG_VERSION}" "--enable-indirect-deps --with-internal-glib --with-pc-path=${TARGET_PKG_CONFIG_PATH}"
 

diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh
@@ -274,6 +274,10 @@ elif [ "${WIN32}" -eq 1 ]; then
 fi
 
 download cairo "${CAIRO_VERSION}" "${CAIRO_URL}" "tar.xz"
+
+# fix build when compiler or linker uses stderr, see https://gitlab.freedesktop.org/cairo/cairo/-/issues/121
+patch_file cairo "${CAIRO_VERSION}" "configure" 's/test "x$cairo_cc_stderr" != "x"/false/g'
+
 build_autoconf cairo "${CAIRO_VERSION}" "${CAIRO_EXTRAFLAGS}"
 
 # FIXME tests are failing :(
@@ -388,10 +392,12 @@ if [ "${MACOS}" -eq 1 ] || [ "${WASM}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
         GLIB_EXTRAFLAGS+=" ac_cv_lib_socket_socket=no ac_cv_func_posix_getgrgid_r=no ac_cv_func_posix_getpwuid_r=no glib_cv_stack_grows=no glib_cv_uscore=no"
     fi
 
+    export EXTRA_CFLAGS="-Wno-incompatible-function-pointer-types"
+
     if [ "${MACOS}" -eq 1 ]; then
         export EXTRA_LDFLAGS="-lresolv"
     elif [ "${WIN32}" -eq 1 ]; then
-        export EXTRA_CFLAGS="-Wno-format -Wno-format-overflow"
+        export EXTRA_CFLAGS="${EXTRA_CFLAGS} -Wno-format -Wno-format-overflow"
     fi
 
     download glib ${GLIB_VERSION} "${GLIB_URL}" "${GLIB_TAR_EXT}"

diff --git a/setup/functions.sh b/setup/functions.sh
@@ -655,10 +655,11 @@ function build_host_autoconf() {
     unset CXX
     unset LD
     unset STRIP
-    unset CFLAGS
     unset CPPFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
+
+    export CFLAGS="${EXTRA_CFLAGS}"
+    export CXXFLAGS="${EXTRA_CXXFLAGS}"
+    export LDFLAGS="${EXTRA_LDFLAGS}"
 
     if [ -e "${PAWPAW_ROOT}/patches/${pkgname}" ] && [ ! -f "${pkgdir}/.stamp_cleanup" ] && [ ! -f "${pkgdir}/.stamp_configured" ]; then
         local patchtargets="${PAWPAW_TARGET}"
@@ -709,6 +710,10 @@ function build_host_autoconf() {
         touch .stamp_installed
         popd
     fi
+
+    unset CFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
 }
 
 function build_host_cmake() {