From 65c80ed68615e4fd06b0c68f77ae6acca41ed584 Mon Sep 17 00:00:00 2001 From: Rye Date: Tue, 5 Nov 2024 05:45:55 -0800 Subject: Fix tracy invariant timer support on macos GHA builds --- .github/workflows/build.yaml | 2 +- indra/cmake/Tracy.cmake | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 84a3791436..5c8e552d6a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -47,7 +47,7 @@ jobs: continue-on-error: ${{ matrix.experimental }} strategy: matrix: - runner: [windows-large, macos-14-xlarge] + runner: [windows-large, macos-15-xlarge] experimental: [false] include: - runner: linux-large diff --git a/indra/cmake/Tracy.cmake b/indra/cmake/Tracy.cmake index 9eee9eb57f..3f92cff899 100644 --- a/indra/cmake/Tracy.cmake +++ b/indra/cmake/Tracy.cmake @@ -36,11 +36,6 @@ if (USE_TRACY) target_compile_definitions(ll::tracy INTERFACE -DTRACY_NO_BROADCAST=1 -DTRACY_ONLY_LOCALHOST=1) endif () - # GHA runners don't always provide invariant TSC support, but always build with LL_TESTS enabled - if (DARWIN AND LL_TESTS) - target_compile_definitions(ll::tracy INTERFACE -DTRACY_TIMER_FALLBACK=1) - endif () - # See: indra/llcommon/llprofiler.h add_compile_definitions(LL_PROFILER_CONFIGURATION=3) endif (USE_TRACY) -- cgit v1.2.3