Skip to content

Commit

Permalink
build.yml: Make MacOS build work
Browse files Browse the repository at this point in the history
  • Loading branch information
abraxa committed Mar 7, 2024
1 parent e881129 commit 54b1485
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,10 @@ jobs:
libzip libusb libftdi hidapi nettle check doxygen swig \
glib [email protected] cmake boost sdcc $BREW_PYTHON_VERSION $BREW_QT_VERSION
- name: Provide qt also in prefix directory as qt is using a keg
run: |
brew link -f $BREW_QT_VERSION
- name: Checkout sigrok-build
uses: actions/checkout@v4
with:
Expand Down
17 changes: 16 additions & 1 deletion ci/macos/sigrok-macos-create-dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,24 @@
set -e
set -x


echo "------------------------------------------"
echo $(brew --prefix "$BREW_QT_VERSION")
find /usr/local/opt/qt
echo "------------------------------------------"
echo $(brew --cellar "$BREW_QT_VERSION")
echo "------------------------------------------"
# Note: Turn "qt 6.6.1" into "qt/6.6.1"
QT_VER=$(brew list --versions qt)
QT_VER_PATH=$(echo $QT_VER | sed 's# #/#')
p=$(brew --cellar)/$QT_VER_PATH/share/qt/translations
find $p -iname "qt*.qm"
echo "------------------------------------------"
echo "------------------------------------------"

# Path to Qt5 binaries
QT_BIN_DIR=$(brew list "$BREW_QT_VERSION" | grep bin | head -n 1 | xargs dirname)
QT_TRANSLATIONS_DIR=$(brew --prefix "$BREW_QT_VERSION")/translations
QT_TRANSLATIONS_DIR=$p

# Path to Python 3 framework
PYTHON_FRAMEWORK_DIR=$(brew list "$BREW_PYTHON_VERSION" | grep Python.framework/Python | head -n 1 | xargs dirname)
Expand Down

0 comments on commit 54b1485

Please sign in to comment.