Skip to content

Commit 5f8d9fa

Browse files
committed
OS X: fix github workflow with updated icu4c library
By-default icu4c library version was hardcoded to v74. It appears, that the updated version number is greater than that. This fix makes the version number lookup more flexible. As soon as it's the only version in the path (apparently there should only be one icu4c library QLog links against).
1 parent 3e1f2df commit 5f8d9fa

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

.github/workflows/macOSBuild.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,19 @@ jobs:
5151
- name: Build dmg
5252
run: |
5353
cd build
54+
ICU4C_LIB_PATH="$(brew --prefix icu4c)/lib"
55+
ICU4C_LIB_NAME="$(ls ${ICU4C_LIB_PATH} | grep -E '^libicui18n\.[0-9]+\.dylib$')"
56+
ICU4C_LIB="${ICU4C_LIB_PATH}/${ICU4C_LIB_NAME}"
5457
macdeployqt qlog.app -executable=./qlog.app/Contents/MacOS/qlog
5558
cp `brew --prefix`/lib/libhamlib.dylib qlog.app/Contents/Frameworks/libhamlib.dylib
5659
cp `brew --prefix`/lib/libqt6keychain.dylib qlog.app/Contents/Frameworks/libqt6keychain.dylib
5760
cp `brew --prefix`/lib/libdbus-1.dylib qlog.app/Contents/Frameworks/libdbus-1.dylib
5861
cp `brew --prefix brotli`/lib/libbrotlicommon.1.dylib qlog.app/Contents/Frameworks/libbrotlicommon.1.dylib
59-
cp `brew --prefix`/opt/icu4c/lib/libicui18n.74.dylib qlog.app/Contents/Frameworks/libicui18n.74.dylib
62+
cp ${ICU4C_LIB} qlog.app/Contents/Frameworks/${ICU4C_LIB_NAME}
6063
install_name_tool -change `brew --prefix`/lib/libhamlib.dylib @executable_path/../Frameworks/libhamlib.dylib qlog.app/Contents/MacOS/qlog
6164
install_name_tool -change `brew --prefix`/lib/libqt6keychain.dylib @executable_path/../Frameworks/libqt6keychain.dylib qlog.app/Contents/MacOS/qlog
6265
install_name_tool -change @loader_path/libbrotlicommon.1.dylib @executable_path/../Frameworks/libbrotlicommon.1.dylib qlog.app/Contents/MacOS/qlog
63-
install_name_tool -change /usr/local/opt/icu4c/lib/libicui18n.74.dylib @executable_path/../Frameworks/libicui18n.74.dylib qlog.app/Contents/MacOS/qlog
66+
install_name_tool -change ${ICU4C_LIB} @executable_path/../Frameworks/${ICU4C_LIB_NAME} qlog.app/Contents/MacOS/qlog
6467
otool -L qlog.app/Contents/MacOS/qlog
6568
macdeployqt qlog.app -dmg
6669
- name: Copy artifact

0 commit comments

Comments
 (0)