Skip to content

Commit c7156ec

Browse files
committed
Move patching before the release
1 parent 2f51df3 commit c7156ec

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

.github/workflows/llvm-binaries.yml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,13 @@ jobs:
380380
- name: Install LLVM
381381
run: cmake --build ${{ github.workspace }}/BinaryCache/1 --target ${{ matrix.install_target }}
382382

383+
- name: Patch VS path in LLVMExports.cmake (Windows only)
384+
if: ${{ matrix.os == 'windows-2025' }}
385+
shell: pwsh
386+
working-directory: ${{ github.workspace }}/BuildRoot/${{ env.PACKAGE_NAME }}
387+
run: |
388+
pwsh -File ${{ github.workspace }}/SourceCache/llvm-build/scripts/fix-vs.ps1
389+
383390
- name: Package LLVM
384391
working-directory: ${{ github.workspace }}/BuildRoot/
385392
run: >-
@@ -400,14 +407,3 @@ jobs:
400407
gh extension install actions/gh-actions-cache
401408
gh actions-cache delete sccache-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.configuration }}-package- --confirm -R ${{ github.repository }}
402409
continue-on-error: true
403-
404-
## Post-processing step for Windows: Patch hardcoded VS path in LLVMExports.cmake
405-
# After the LLVM install step, if on Windows, run the fix-vs.ps1 script to replace the hardcoded VS path.
406-
# This ensures the resulting LLVMExports.cmake uses $ENV{VSINSTALLDIR} for portability.
407-
408-
- name: Patch VS path in LLVMExports.cmake (Windows only)
409-
if: ${{ matrix.os == 'windows-2025' }}
410-
shell: pwsh
411-
working-directory: ${{ github.workspace }}/BuildRoot/${{ env.PACKAGE_NAME }}
412-
run: |
413-
pwsh -File ${{ github.workspace }}/SourceCache/llvm-build/scripts/fix-vs.ps1

0 commit comments

Comments
 (0)