diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c578b76b..92d41dac1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,6 +24,8 @@ jobs: steps: - uses: actions/checkout@v4 + # The VulkanSDK libs for Windows is manually generated using build_windows_vulkan_libs.ps1 + attached to issue #8925. + # (we have a .yml workflow in commit history if it becomes ever useful to create this on CI too) - name: Install Dependencies shell: powershell run: | @@ -35,9 +37,9 @@ jobs: Expand-Archive -Path SDL3-devel-3.2.18-VC.zip echo "SDL3_DIR=$(pwd)\SDL3-devel-3.2.18-VC\SDL3-3.2.18\" >>${env:GITHUB_ENV} - Invoke-WebRequest -Uri "https://github.com/ocornut/imgui/files/3789205/vulkan-sdk-1.1.121.2.zip" -OutFile vulkan-sdk-1.1.121.2.zip - Expand-Archive -Path vulkan-sdk-1.1.121.2.zip - echo "VULKAN_SDK=$(pwd)\vulkan-sdk-1.1.121.2\" >>${env:GITHUB_ENV} + Invoke-WebRequest -Uri "https://github.com/user-attachments/files/22464296/vulkan_windows_libs_1.4.326.zip" -OutFile vulkan_windows_libs_1.4.326.zip + Expand-Archive -Path vulkan_windows_libs_1.4.326.zip + echo "VULKAN_SDK=$(pwd)\vulkan_windows_libs_1.4.326\" >>${env:GITHUB_ENV} - name: Fix Projects shell: powershell diff --git a/.github/workflows/build_windows_vulkan_libs.ps1 b/.github/workflows/build_windows_vulkan_libs.ps1 index 57e542372..6658f5b5b 100644 --- a/.github/workflows/build_windows_vulkan_libs.ps1 +++ b/.github/workflows/build_windows_vulkan_libs.ps1 @@ -1,3 +1,8 @@ +# This is current meant to be run manually, occasionally: +# - Run then zip the contents of vulkanArtifact/ into e.g. vulkan_windows_libs_1.4.326 +# - Upload as an attachment to https://github.com/ocornut/imgui/pull/8925 then change filename in build.yml +# - There is a build_windows_vulkan_libs.yml in commit history that we removed thinking this is run so rarely we don't need to pollute CI UI with it. + # Set default vulkan version if none provided if (-not $env:VULKAN_TAG) { $env:VULKAN_TAG = "1.4.326" } diff --git a/.github/workflows/build_windows_vulkan_libs.yml b/.github/workflows/build_windows_vulkan_libs.yml deleted file mode 100644 index beaa2ff0a..000000000 --- a/.github/workflows/build_windows_vulkan_libs.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: build-windows-vulkan-libs - -on: workflow_dispatch - -jobs: - Windows: - runs-on: windows-2025 - env: - VULKAN_TAG: 1.4.326 - steps: - - uses: actions/checkout@v4 - - - name: Build Vulkan libs - shell: powershell - run: .github/workflows/build_windows_vulkan_libs.ps1 - - - uses: actions/upload-artifact@v4 - with: - name: vulkan_windows_libs_${{ env.VULKAN_TAG }} - path: vulkanArtifact - overwrite: 'true' - diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 344d5e228..636110ba2 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -48,6 +48,7 @@ Other Changes: - Misc: Debuggers: added type formatters for the LLDB debuggers (e.g. Xcode, Android Studio & more) to provide nicer display for ImVec2, ImVec4, ImVector etc. See misc/debuggers/ for details. (#8950) [@mentlerd] +- CI: Updates Windows CI scripts to generate/use VulkanSDK. (#8925, #8778) [@yaz0r] - Backends: all backends call ImGuiPlatformIO::ClearPlatformHandlers() and ClearRendererHandlers() on shutdown, so as not to leave function pointers which may be dangling when using backend in e.g. DLL. (#8945, #2769)