From 31aebb33ae95557b1b8c0e746d7bb7c7e1ed0592 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 6 Nov 2023 20:49:54 +0100
Subject: Fix macos builds with newer icu

---
 .ci/macos/build.sh    | 9 +++++----
 .ci/macos/notarize.sh | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to '.ci')

diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh
index efc183e8..e4978231 100755
--- a/.ci/macos/build.sh
+++ b/.ci/macos/build.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -ue
 
@@ -6,10 +6,11 @@ set -ue
 #TAG=$(git tag -l --points-at HEAD)
 
 # Add Qt binaries to path
-PATH="${HOME}/Qt/6.5.1/macos/bin/:${PATH}"
+QT_BASEPATH=(${HOME}/Qt/6.*/macos/)
+PATH="${QT_BASEPATH}/bin/:${PATH}"
 export PATH
 
-CMAKE_PREFIX_PATH="${HOME}/Qt/6.5.1/macos/lib/cmake"
+CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
 export CMAKE_PREFIX_PATH
 
 cmake -GNinja -S. -Bbuild \
@@ -19,7 +20,7 @@ cmake -GNinja -S. -Bbuild \
       -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
       -DUSE_BUNDLED_OPENSSL=ON \
-      -DQt6_DIR=${HOME}/Qt/6.5.1/macos/lib/cmake \
+      -DQt6_DIR=${QT_BASEPATH}/lib/cmake \
       -DCI_BUILD=ON
 cmake --build build
 cmake --install build
diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index b5c83201..b0c05154 100755
--- a/.ci/macos/notarize.sh
+++ b/.ci/macos/notarize.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -u
 
@@ -6,8 +6,8 @@ set -u
 # https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18
 
 # Add Qt binaries to path
-PATH="${HOME}/Qt/6.5.1/macos/bin/:${PATH}"
-export PATH
+export QTPATH=(${PATH}/Qt/6.*/macos/bin)
+export PATH=${QTPATH}:${PATH}
 
 security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
 
-- 
cgit 1.4.1