mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Merge pull request #113112 from Repiteo/ci/d3d12-conditional
CI: Build Windows without D3D12 if install fails
This commit is contained in:
commit
c171af7ffa
1 changed files with 11 additions and 3 deletions
14
.github/workflows/windows_builds.yml
vendored
14
.github/workflows/windows_builds.yml
vendored
|
|
@ -9,7 +9,6 @@ env:
|
|||
dev_mode=yes
|
||||
module_text_server_fb_enabled=yes
|
||||
debug_symbols=no
|
||||
d3d12=yes
|
||||
"angle_libs=${{ github.workspace }}/"
|
||||
"accesskit_sdk_path=${{ github.workspace }}/accesskit-c-0.17.0/"
|
||||
SCONS_CACHE_MSVC_CONFIG: true
|
||||
|
|
@ -74,7 +73,16 @@ jobs:
|
|||
uses: ./.github/actions/godot-deps
|
||||
|
||||
- name: Download Direct3D 12 SDK components
|
||||
run: python ./misc/scripts/install_d3d12_sdk_windows.py
|
||||
shell: sh
|
||||
id: d3d12-sdk
|
||||
run: |
|
||||
if python ./misc/scripts/install_d3d12_sdk_windows.py; then
|
||||
echo "D3D12_ENABLED=yes" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "::warning::Windows: Direct3D 12 SDK installation failed, building without Direct3D 12 support."
|
||||
echo "D3D12_ENABLED=no" >> "$GITHUB_OUTPUT"
|
||||
fi
|
||||
continue-on-error: true
|
||||
|
||||
- name: Download pre-built ANGLE static libraries
|
||||
uses: dsaltares/fetch-gh-release-asset@1.1.2
|
||||
|
|
@ -101,7 +109,7 @@ jobs:
|
|||
- name: Compilation
|
||||
uses: ./.github/actions/godot-build
|
||||
with:
|
||||
scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }}
|
||||
scons-flags: ${{ env.SCONS_FLAGS }} ${{ matrix.scons-flags }} d3d12=${{ steps.d3d12-sdk.outputs.D3D12_ENABLED }}
|
||||
platform: windows
|
||||
target: ${{ matrix.target }}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue