Skip to content

Commit b814a28

Browse files
committed
[fix] ci: fix macos ci
1 parent fbf5fbd commit b814a28

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ jobs:
135135
make
136136
cd build/
137137
macdeployqt FastTrack.app -always-overwrite
138-
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
138+
wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
139139
cp *.qm FastTrack.app/Contents/Resources/
140-
python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
140+
python macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/
141141
hdiutil create -volname FastTrack -srcfolder FastTrack.app -ov -format UDZO FastTrack.dmg
142142
- name: upload_artefact
143143
uses: actions/upload-artifact@v1

.github/workflows/build_cli.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ jobs:
128128
make
129129
cd build_cli/
130130
macdeployqt FastTrack-cli.app -always-overwrite
131-
wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
132-
python2.7 macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/
131+
wget https://raw.githubusercontent.com/tamlok/macdeployqtfix/master/macdeployqtfix.py
132+
python macdeployqtfix.py FastTrack-cli.app/Contents/MacOS/FastTrack-cli ../../Qt/${{ env.QT_VERSION }}/
133133
hdiutil create -volname FastTrack-cli -srcfolder FastTrack-cli.app -ov -format UDZO FastTrack-cli.dmg
134134
- name: upload_artefact
135135
uses: actions/upload-artifact@v2

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ jobs:
105105
brew upgrade -q -f
106106
brew install pkg-config
107107
brew install libomp
108-
brew install opencv
108+
brew tap FastTrackOrg/fasttrack
109+
brew install --build-from-source FastTrackOrg/fasttrack/opencv
109110
brew install googletest
110111
export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
111112
python -m pip install --upgrade pip setuptools wheel

0 commit comments

Comments
 (0)