Skip to content

Commit ef7a7b8

Browse files
committed
CI mac: enforce use of Qt5 even if Qt6 present
fixes failed run <https://github.com/CESNET/UltraGrid/actions/runs/5925739298/job/16065753514> From some point, it seems that Qt6 (Homebrew port _qt_) is already installed but it doesn't bundle successfully. So enforce using Qt5 (previous symlink command didn't replace the `/usr/local/opt/qt` symlink if already present). \+ copy the link instead of linking it to prevent: Error: /usr/local/opt/qt@5 is not a valid keg
1 parent 942bf29 commit ef7a7b8

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.github/scripts/macOS/prepare.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ brew install qt@5
2626
brew install glm
2727
curl -L https://raw.githubusercontent.com/miniupnp/libnatpmp/master/natpmp_declspec.h -o /usr/local/include/natpmp_declspec.h
2828

29-
sudo ln -s /usr/local/opt/qt@5 /usr/local/opt/qt
29+
rm -f /usr/local/opt/qt
30+
cp -af /usr/local/opt/qt@5 /usr/local/opt/qt
3031

3132
.github/scripts/macOS/install_dylibbundler_v2.sh
3233

0 commit comments

Comments
 (0)