Skip to content

Move to GitHub worflow runner macos-12 #13296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Swiftb0y merged 2 commits into from
Jun 4, 2024
Merged

Move to GitHub worflow runner macos-12 #13296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
694d026
Move to GitHub worflow runner macos-12
daschuer May 26, 2024
5e9602f
Document the current Runtime of GlobalTrackCacheTest.concurrentDelete
daschuer Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 9 additions & 1 deletion src/test/globaltrackcache_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down