Skip to content

Commit 2ac8187

Browse files
committed
[fix] ci: fix mac deployment
1 parent 1879c44 commit 2ac8187

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [master]
66

77
env:
8-
QT_VERSION: 6.2.4
8+
QT_VERSION: 6.3.0 # Need <6.3.0 for macdeployqt to work https://github.com/FastTrackOrg/FastTrack/issues/51
99
OPENCV_VERSION: 4.5.5
1010

1111
jobs:
@@ -89,7 +89,7 @@ jobs:
8989
path: src/build/
9090

9191
job_3:
92-
runs-on: macos-latest
92+
runs-on: macos-10.15
9393
steps:
9494
- uses: actions/checkout@v2
9595
- uses: actions/setup-python@v2
@@ -119,6 +119,7 @@ jobs:
119119
cd build/
120120
macdeployqt FastTrack.app -always-overwrite
121121
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
122+
cp /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib FastTrack.app/Contents/Frameworks/ ## See workaround header
122123
python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
123124
hdiutil create -volname FastTrack -srcfolder FastTrack.app -ov -format UDZO FastTrack.dmg
124125

.github/workflows/build_cli.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [master]
66

77
env:
8-
QT_VERSION: 6.2.4
8+
QT_VERSION: 6.3.0 # Need <6.3.0 for macdeployqt to work https://github.com/FastTrackOrg/FastTrack/issues/51
99
OPENCV_VERSION: 4.5.5
1010

1111
jobs:
@@ -51,7 +51,7 @@ jobs:
5151
path: ./FastTrack-cli-x86_64.AppImage
5252

5353
job_2:
54-
runs-on: macos-latest
54+
runs-on: macos-10.15
5555
steps:
5656
- uses: actions/checkout@v2
5757
- uses: actions/setup-python@v2
@@ -60,7 +60,7 @@ jobs:
6060
- name: install qt6
6161
run: |
6262
pip install aqtinstall
63-
python3 -m aqt install-qt -m qtwebengine qtwebchannel qtpositioning -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
63+
python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
6464
echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH
6565
- name: install opencv
6666
run: |
@@ -70,6 +70,9 @@ jobs:
7070
brew install libomp
7171
brew install pkg-config
7272
brew install opencv
73+
brew install openssl
74+
brew unlink unixodbc
75+
brew install libiodbc
7376
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
7477
- name: build
7578
run: |
@@ -78,7 +81,8 @@ jobs:
7881
cd build_cli/
7982
macdeployqt FastTrack-cli.app -always-overwrite
8083
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
81-
python2.7 macdeployqtfix.py fasttrack_cli.app/Contents/MacOS/fasttrack-cli ../../Qt/${{ env.QT_VERSION }}/
84+
cp /usr/local/opt/gcc/lib/gcc/11/libgcc_s.1.1.dylib FastTrack-cli.app/Contents/Frameworks/ ## See workaround header
85+
python2.7 macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/
8286
hdiutil create -volname FastTrack-cli -srcfolder FastTrack-cli.app -ov -format UDZO FastTrack-cli.dmg
8387
- name: Mac artefact
8488
uses: actions/upload-artifact@v2

0 commit comments

Comments
 (0)