From 5e166a780f58f48b34a9dc34e3784f503aa386cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Wed, 23 Oct 2024 08:35:39 +0300 Subject: [PATCH 1/4] Bump macos version --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 4495450..f0c13f8 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -43,7 +43,7 @@ jobs: } - { name: macOS_x64, - os: macos-12, + os: macos-13, build: make } From 7801245ec95c2defee60843d7b085abd2cd683ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Thu, 24 Oct 2024 20:37:54 +0300 Subject: [PATCH 2/4] Update build_tests.yml --- .github/workflows/build_tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index f0c13f8..be218e5 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -64,7 +64,12 @@ jobs: modules: ${{ matrix.qt.modules}} - name: Setup project + if: ! contains( matrix.config.os, 'macos' ) run: qmake -recursive CONFIG+=debug + - name: Setup project + if: contains( matrix.config.os, 'macos' ) + run: qmake -recursive CONFIG+=debug -early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib + - name: Build project run: ${{ matrix.config.build }} From 620101e8690605aa0411a8f599624e8517293477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Thu, 24 Oct 2024 20:41:31 +0300 Subject: [PATCH 3/4] Update build_tests.yml --- .github/workflows/build_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index be218e5..e0ebc0e 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -64,7 +64,7 @@ jobs: modules: ${{ matrix.qt.modules}} - name: Setup project - if: ! contains( matrix.config.os, 'macos' ) + if: ${{ ! contains( matrix.config.os, 'macos' ) }} run: qmake -recursive CONFIG+=debug - name: Setup project From 8087005520a973289f09a4744c2fde081fde8d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?= Date: Thu, 24 Oct 2024 20:56:21 +0300 Subject: [PATCH 4/4] Update build_tests.yml --- .github/workflows/build_tests.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index e0ebc0e..2d23d59 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -34,16 +34,20 @@ jobs: - { name: Win_x64, os: windows-2019, + q_extra: "", build: nmake } - { name: Linux_x64, os: ubuntu-20.04, + q_extra: "", build: make } - { name: macOS_x64, os: macos-13, + # https://stackoverflow.com/a/77631382 + q_extra: "-early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib", build: make } @@ -64,12 +68,7 @@ jobs: modules: ${{ matrix.qt.modules}} - name: Setup project - if: ${{ ! contains( matrix.config.os, 'macos' ) }} - run: qmake -recursive CONFIG+=debug - - - name: Setup project - if: contains( matrix.config.os, 'macos' ) - run: qmake -recursive CONFIG+=debug -early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib + run: qmake -recursive CONFIG+=debug ${{ matrix.config.q_extra }} - name: Build project run: ${{ matrix.config.build }}