From fdc63e133235985bc8b8fd8f3921c04476efd794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 Dec 2024 13:30:27 +0100 Subject: [PATCH 1/3] chore: upgrade macos runner to macos-13 Ventura and xcode15 This applies again failing changes form #13606. Since macos-12 is no longer available we hav no other chance. I apply this to 2.4 to keep the CI allive. until 2.5.0 is finally released. --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b5e8e3bee4b..a280ac071e72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,8 +60,8 @@ jobs: artifacts_path: build/*.deb artifacts_slug: ubuntu-jammy qt_qpa_platform: offscreen - - name: macOS 12 x64 - os: macos-12 + - name: macOS 13 x64 + os: macos-13 cmake_args: >- -DBULK=ON -DCOREAUDIO=ON @@ -83,8 +83,8 @@ jobs: artifacts_path: build/*.dmg artifacts_slug: macos-macosintel qt_qpa_platform: offscreen - - name: macOS 12 arm64 - os: macos-12 + - name: macOS 13 arm64 + os: macos-13 cmake_args: >- -DBULK=ON -DCOREAUDIO=ON From 8a063691647ac0506097aa76566817bdf7ec1c9d Mon Sep 17 00:00:00 2001 From: fwcd Date: Fri, 6 Dec 2024 04:03:44 +0100 Subject: [PATCH 2/3] CI: Use retry loop for CPack to work around macOS issue --- .github/workflows/build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a280ac071e72..517a87128dc7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -351,8 +351,15 @@ jobs: - name: "Package" if: matrix.cpack_generator != null - run: cpack -G ${{ matrix.cpack_generator }} -V - working-directory: build + # Use retry loop to work around a race condition on macOS causing + # 'Resource busy' errors with 'hdiutil'. See + # https://github.com/actions/runner-images/issues/7522 + uses: nick-fields/retry@v3 + with: + timeout_minutes: 30 + max_attempts: 12 + retry_wait_seconds: 1 + command: cd build && cpack -G ${{ matrix.cpack_generator }} -V - name: "[Ubuntu] Import PPA GPG key" if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null From 43905f8e7dab2dc03f95ebf813fea8e3ec8ac0d2 Mon Sep 17 00:00:00 2001 From: fwcd Date: Fri, 6 Dec 2024 04:41:40 +0100 Subject: [PATCH 3/3] CI: Fix shell syntax on Windows --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 517a87128dc7..e17c68195c65 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -359,7 +359,9 @@ jobs: timeout_minutes: 30 max_attempts: 12 retry_wait_seconds: 1 - command: cd build && cpack -G ${{ matrix.cpack_generator }} -V + command: | + cd build + cpack -G ${{ matrix.cpack_generator }} -V - name: "[Ubuntu] Import PPA GPG key" if: startsWith(matrix.os, 'ubuntu') && env.RRYAN_AT_MIXXX_DOT_ORG_GPG_PRIVATE_KEY != null