diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e804eb363d3..b55d24b127b8 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 11 x64 - os: macos-11 + - name: macOS 12 x64 + os: macos-12 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 11 arm64 - os: macos-11 + - name: macOS 12 arm64 + os: macos-12 cmake_args: >- -DBULK=ON -DCOREAUDIO=ON diff --git a/src/test/globaltrackcache_test.cpp b/src/test/globaltrackcache_test.cpp index cde8a586897b..30051de06d82 100644 --- a/src/test/globaltrackcache_test.cpp +++ b/src/test/globaltrackcache_test.cpp @@ -153,7 +153,15 @@ TEST_F(GlobalTrackCacheTest, concurrentDelete) { // NOTE(2019-12-14, uklotzde): On Travis and macOS executing 10_000 // iterations takes ~1 sec. In order to safely finish this test within // the timeout limit of 30 sec. we use 20 * 10_000 = 200_000 iterations. - for (int i = 0; i < 200000; ++i) { + // + // NOTE(2024-06-03, daschuer): Reduced to 100000 because the we hit a + // timeout on the macos-12 GitHub workflow runner + // With 200000 we had: + // ubuntu-22.04 0.73 sec + // windows-2019 9.86 sec + // macos-11 5.81 sec + // macos-12 timeout after 45.02 sec (24.55 sec with 100000) + for (int i = 0; i < 100000; ++i) { m_recentTrackPtr.reset(); TrackId trackId;