From f668de288f8e53abbc2d98ebd15bb318f8616171 Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Sat, 5 Oct 2024 12:47:40 +1000 Subject: [PATCH] Restore the remaining macOS builds --- .github/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 93c80218..7bd4290b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -158,8 +158,8 @@ jobs: os: [ 'macos-13', 'macos-14', 'macos-15' ] env: - { cc: clang, cxx: clang++, coverage: false } - #- { cc: gcc-14, cxx: g++-14, coverage: false } - #- { cc: gcc-14, cxx: g++-14, coverage: true } + - { cc: gcc-14, cxx: g++-14, coverage: false } + - { cc: gcc-14, cxx: g++-14, coverage: true } exclude: # GitHub's macOS 14+ gcc can only target arm64, but Qt didn't add Apple arm64 support until Qt 6.2, so: # Exclude Qt 5.x (and 6.0, 6.1) with GCC on macOS 14+. Also see the `arch` step below for more details. @@ -255,7 +255,7 @@ jobs: find "$RUNNER_TEMP" -name 'Info.plist' -execdir cat '{}' \; "$RUNNER_TEMP/src/cli/dokit.app/Contents/MacOS/dokit" --version - name: Test - run: ctest --output-on-failure --test-dir "$RUNNER_TEMP" --verbose --debug + run: ctest --output-on-failure --test-dir "$RUNNER_TEMP" --verbose timeout-minutes: 1 - name: Collate test coverage if: matrix.env.coverage