[fix] ci: fix homebrew

FastTrackOrg · Jul 7, 2023 · 201a6f0 · 201a6f0
1 parent ed287fe
commit 201a6f0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.0
+  QT_VERSION: 6.2.4
   OPENCV_VERSION: 4.7.0
 
 jobs:
@@ -97,7 +97,7 @@ jobs:
           path: src/build/FastTrack
 
   build_mac:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -108,11 +108,17 @@ jobs:
           pip install aqtinstall
           python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
           echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH
+      - name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
       - name: install_opencv
         run: |
-          rm -rf /usr/local/bin/2to3
-          brew update
-          brew upgrade
+          rm -f /usr/local/bin/2to3*
+          rm -f /usr/local/bin/idle3*
+          rm -f /usr/local/bin/pydoc3*
+          rm -f /usr/local/bin/python3*
+          brew update -q -f
+          brew upgrade -q -f
           brew install libomp
           brew install pkg-config
           brew install opencv
@@ -126,6 +132,7 @@ jobs:
           make
           cd build/
           macdeployqt FastTrack.app -always-overwrite
+          #cp -n /usr/local/opt/vtk/lib/libvtkCommonComputationalGeometry-9.2.1.dylib FastTrack.app/Contents/Frameworks/
           wget https://raw.githubusercontent.com/arl/macdeployqtfix/master/macdeployqtfix.py
           cp *.qm FastTrack.app/Contents/Resources/
           python2.7 macdeployqtfix.py FastTrack.app/Contents/MacOS/FastTrack ../../Qt/${{ env.QT_VERSION }}/

diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -90,7 +90,7 @@ jobs:
           path: src/build_cli/
 
   build_mac:
-      runs-on: macos-11
+      runs-on: macos-latest
       steps:
         - uses: actions/checkout@v2
         - uses: actions/setup-python@v2
@@ -101,11 +101,17 @@ jobs:
             pip install aqtinstall
             python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
             echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH
+        - name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323
+          id: set-up-homebrew
+          uses: Homebrew/actions/setup-homebrew@master
         - name: install_opencv
           run: |
-              rm -rf /usr/local/bin/2to3
-              brew update
-              brew upgrade
+              rm -f /usr/local/bin/2to3*
+              rm -f /usr/local/bin/idle3*
+              rm -f /usr/local/bin/pydoc3*
+              rm -f /usr/local/bin/python3*
+              brew update -q -f
+              brew upgrade -q -f
               brew install pkg-config
               brew install opencv
               brew install openssl

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -79,7 +79,7 @@ jobs:
           ./test.sh win
 
   test_mac:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -90,11 +90,17 @@ jobs:
           pip install aqtinstall
           python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ mac desktop ${{ env.QT_VERSION }}
           echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos/bin/ >> $GITHUB_PATH
+      - name: Set up Homebrew #https://github.com/Homebrew/homebrew-cask/issues/150323
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
       - name: install_deps
         run: |
-          rm -rf /usr/local/bin/2to3
-          brew update
-          brew upgrade
+          rm -f /usr/local/bin/2to3*
+          rm -f /usr/local/bin/idle3*
+          rm -f /usr/local/bin/pydoc3*
+          rm -f /usr/local/bin/python3*
+          brew update -q -f
+          brew upgrade -q -f
           brew install pkg-config
           brew install libomp
           brew install opencv