[fix] ci: fix homebrew

FastTrackOrg · Jul 7, 2023 · 873e4f0 · 873e4f0
1 parent ed287fe
commit 873e4f0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 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:
@@ -108,14 +108,20 @@ 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
+          brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/f54d39e63b609a2ae25dd039f9edae6c82120f96/Formula/opencv.rb
           brew install openssl
           brew unlink unixodbc
           brew install libiodbc
@@ -126,6 +132,7 @@ jobs:
           make
           cd build/
           macdeployqt FastTrack.app -always-overwrite
+          #cp -n /usr/local/opt/vtk/lib/libvtk*-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
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.5.0
+  QT_VERSION: 6.5.1
   OPENCV_VERSION: 4.7.0
 
 jobs:
@@ -101,13 +101,19 @@ 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 https://raw.githubusercontent.com/Homebrew/homebrew-core/f54d39e63b609a2ae25dd039f9edae6c82120f96/Formula/opencv.rb
               brew install openssl
               brew unlink unixodbc
               brew install libiodbc

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -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