Skip to content
Snippets Groups Projects
Unverified Commit f5e2708a authored by nat-goodspeed's avatar nat-goodspeed Committed by GitHub
Browse files

Merge pull request #1685 from secondlife/brad/materials_featurette_build_workaround

Attempted workaround for actions/runner-images#10004 build failures.
parents a73773bc 4b35328e
No related branches found
No related tags found
No related merge requests found
...@@ -312,7 +312,7 @@ jobs: ...@@ -312,7 +312,7 @@ jobs:
AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }} AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
needs: build needs: build
runs-on: windows runs-on: windows-large
steps: steps:
- name: Sign and package Windows viewer - name: Sign and package Windows viewer
if: env.AZURE_KEY_VAULT_URI && env.AZURE_CERT_NAME && env.AZURE_CLIENT_ID && env.AZURE_CLIENT_SECRET && env.AZURE_TENANT_ID 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: ...@@ -412,7 +412,7 @@ jobs:
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
with: with:
pattern: "*-metadata" pattern: "*-metadata"
- name: Rename metadata - name: Rename metadata
run: | run: |
cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml cp Windows-metadata/autobuild-package.xml Windows-autobuild-package.xml
...@@ -441,7 +441,7 @@ jobs: ...@@ -441,7 +441,7 @@ jobs:
append_body: true append_body: true
fail_on_unmatched_files: true fail_on_unmatched_files: true
files: | files: |
macOS-installer/*.dmg macOS-installer/*.dmg
Windows-installer/*.exe Windows-installer/*.exe
*-autobuild-package.xml *-autobuild-package.xml
*-viewer_version.txt *-viewer_version.txt
......
...@@ -103,6 +103,11 @@ if (WINDOWS) ...@@ -103,6 +103,11 @@ if (WINDOWS)
string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}") string(REPLACE "/Zi" "/Z7" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") string(REPLACE "/Zi" "/Z7" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
endif() endif()
# workaround for github runner image breakage:
# https://github.com/actions/runner-images/issues/10004#issuecomment-2153445161
# can be removed after the above issue is resolved and deployed across GHA
add_compile_definitions(_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
endif (WINDOWS) endif (WINDOWS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment