Skip to content

Commit f5e2708

Browse files
Merge pull request #1685 from secondlife/brad/materials_featurette_build_workaround
Attempted workaround for actions/runner-images#10004 build failures.
2 parents a73773b + 4b35328 commit f5e2708

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ jobs:
312312
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
313313
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
314314
needs: build
315-
runs-on: windows
315+
runs-on: windows-large
316316
steps:
317317
- name: Sign and package Windows viewer
318318
if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID
@@ -412,7 +412,7 @@ jobs:
412412
- uses: actions/download-artifact@v4
413413
with:
414414
pattern: "*-metadata"
415-
415+
416416
- name: Rename metadata
417417
run: |
418418
cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
@@ -441,7 +441,7 @@ jobs:
441441
append_body: true
442442
fail_on_unmatched_files: true
443443
files: |
444-
macOS-installer/*.dmg
444+
macOS-installer/*.dmg
445445
Windows-installer/*.exe
446446
*-autobuild-package.xml
447447
*-viewer_version.txt

indra/cmake/00-Common.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ if (WINDOWS)
103103
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
104104
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
105105
endif()
106+
107+
# workaround for github runner image breakage:
108+
# https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161
109+
# can be removed after the above issue is resolved and deployed across GHA
110+
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
106111
endif (WINDOWS)
107112

108113

0 commit comments

Comments
 (0)