From 88f8ccfcc1ef26b62f62dd7f814cd559781914e5 Mon Sep 17 00:00:00 2001 From: bgallois Date: Wed, 5 Jul 2023 13:27:44 +0200 Subject: [PATCH] [fix] ci: fix homebrew --- .github/workflows/build.yml | 18 ++++++++++++------ .github/workflows/build_cli.yml | 16 +++++++++++----- .github/workflows/test.yml | 12 +++++++++--- src/FastTrack-Cli.pro | 6 ++---- src/FastTrack.pro | 6 ++---- 5 files changed, 36 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a6cb77..e7f4fed 100644 --- 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 - 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 tap FastTrackOrg/opencv + brew install --build-from-source FastTrackOrg/opencv/opencv brew install pkg-config - brew install opencv brew install openssl brew unlink unixodbc brew install libiodbc diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml index 00572f8..f796cd7 100644 --- 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 index 2120b47..7b56c10 100644 --- 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 index 235fed6..54a7d67 100644 --- 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 index b3a4bd7..6540f27 100644 --- 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