From 2eed40231ace2b7fa3443ec3fc9cea138e8e88c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cl=C3=A9ro?= Date: Thu, 2 May 2024 19:59:51 +0200 Subject: [PATCH 1/2] Use an Intel arch on macOS CI --- .github/workflows/macos.yml | 53 +++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 481e21e..8a3baef 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -2,9 +2,9 @@ name: MacOS on: push: - branches: [ "master", "setup-ci" ] + branches: ['master', 'setup-ci'] pull_request: - branches: [ "master" ] + branches: ['master'] env: # CMake build type (Release, Debug, RelWithDebInfo, etc.). @@ -14,29 +14,30 @@ env: jobs: build: - runs-on: macos-latest + runs-on: macos-latest-large steps: - - name: Check Out - # Checks out the repository. - uses: actions/checkout@v4 - - - name: Install Qt - # Installs the Qt SDK. - uses: jurplel/install-qt-action@v3 - with: - version: ${{env.QT_VERSION}} - host: mac - target: desktop - - - name: Configure CMake - # Configures CMake in a 'build' subdirectory. - run: cmake -B ${{github.workspace}}/build -G "${{env.GENERATOR}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" - - - name: Builds the library. - # Builds with the given configuration. - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} - - - name: Builds the Sandbox app. - # Builds the sandbox app with the given configuration. - run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target sandbox + - name: Check Out + # Checks out the repository. + uses: actions/checkout@v4 + + - name: Install Qt + # Installs the Qt SDK. + uses: jurplel/install-qt-action@v3 + with: + version: ${{env.QT_VERSION}} + host: mac + target: desktop + arch: clang_64 + + - name: Configure CMake + # Configures CMake in a 'build' subdirectory. + run: cmake -B ${{github.workspace}}/build -G "${{env.GENERATOR}}" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY="" + + - name: Builds the library. + # Builds with the given configuration. + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + + - name: Builds the Sandbox app. + # Builds the sandbox app with the given configuration. + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target sandbox From bbf324ee6e0ed2280a94b5ea50d655e02f002116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cl=C3=A9ro?= Date: Thu, 2 May 2024 20:30:33 +0200 Subject: [PATCH 2/2] Try with macOS-13 --- .github/workflows/macos.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 8a3baef..d9d013d 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -14,7 +14,7 @@ env: jobs: build: - runs-on: macos-latest-large + runs-on: macos-13 steps: - name: Check Out