[fix] ci: fix homebrew

FastTrackOrg · Jul 8, 2023 · 24f1cb8 · 24f1cb8
1 parent ed287fe
commit 24f1cb8
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 25 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.5.1
   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,17 +108,24 @@ 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
-          brew install libomp
+          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 suite-sparse
           brew install openssl
           brew unlink unixodbc
           brew install libiodbc
+          brew tap FastTrackOrg/opencv
+          brew install --build-from-source FastTrackOrg/opencv/opencv
           export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
       - name: build_ft
         run: |

diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.0
+  QT_VERSION: 6.5.1
   OPENCV_VERSION: 4.7.0
 
 jobs:
@@ -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,16 +101,23 @@ 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
               brew unlink unixodbc
               brew install libiodbc
+              brew tap FastTrackOrg/opencv
+              brew install --build-from-source FastTrackOrg/opencv/opencv
               export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig/
         - name: build_ftcli
           run: |

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

diff --git a/src/FastTrack-Cli.pro b/src/FastTrack-Cli.pro
@@ -34,14 +34,12 @@ unix:!macx {
 
 unix:macx {
   TARGET = FastTrack-cli
-  CONFIG += c++17
-  QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -mmacosx-version-min=11.7 -O3 -Xpreprocessor
+  CONFIG += c++2a
+  QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -O3 -Xpreprocessor
   QMAKE_CXXFLAGS_RELEASE -= -O1
   QMAKE_CXXFLAGS_RELEASE -= -O2
   QMAKE_CXXFLAGS_RELEASE += -O3
 
-  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
-
   QMAKE_LFLAGS_RELEASE -= -O1
   QMAKE_LFLAGS_RELEASE -= -O2
   QMAKE_LFLAGS_RELEASE += -O3

diff --git a/src/FastTrack.pro b/src/FastTrack.pro
@@ -59,14 +59,12 @@ win32 {
 
 unix:macx {
   TARGET = FastTrack
-  CONFIG += c++17
-  QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -mmacosx-version-min=11.7 -O3 -Xpreprocessor
+  CONFIG += c++2a
+  QMAKE_CXXFLAGS += -std=c++1z -stdlib=libc++ -O3 -Xpreprocessor
   QMAKE_CXXFLAGS_RELEASE -= -O1
   QMAKE_CXXFLAGS_RELEASE -= -O2
   QMAKE_CXXFLAGS_RELEASE += -O3
 
-  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.15
-
   QMAKE_LFLAGS_RELEASE -= -O1
   QMAKE_LFLAGS_RELEASE -= -O2
   QMAKE_LFLAGS_RELEASE += -O3