svn commit: r1934871 - httpd/httpd/trunk/.github/workflows
| Newsgroups | gmane.comp.apache.cvs |
|---|---|
| Message-ID | <178039737359.1882994.17793291898098902408@svn03-he-fi> |
Author: ivan
Date: Tue Jun 2 10:49:33 2026
New Revision: 1934871
Log:
Fix Windows GHA build.
* .github/workflows/windows.yml
(): Use Enter-VsDevShell to find VS installation and save
environment variables to GITHUB_ENV.
Modified:
httpd/httpd/trunk/.github/workflows/windows.yml
Modified: httpd/httpd/trunk/.github/workflows/windows.yml
==============================================================================
--- httpd/httpd/trunk/.github/workflows/windows.yml Tue Jun 2 10:38:28 2026 (r1934870)
+++ httpd/httpd/trunk/.github/workflows/windows.yml Tue Jun 2 10:49:33 2026 (r1934871)
@@ -20,7 +20,6 @@ on:
jobs:
build:
- if: false
strategy:
fail-fast: false
matrix:
@@ -37,6 +36,14 @@ jobs:
env:
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
steps:
+ - name: Prepare Environment
+ run: |
+ $root = &(Join-Path ${env:ProgramFiles(x86)} "\Microsoft Visual Studio\Installer\vswhere.exe") -property installationpath -latest
+ Import-Module (Join-Path $root "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
+ Enter-VsDevShell -VsInstallPath $root -DevCmdArguments "-arch=${{ matrix.arch }}"
+
+ ls env: | foreach { "$($_.Name)=$($_.Value)" >> $env:GITHUB_ENV }
+
- name: Export GitHub Actions cache environment variables
uses: actions/github-script@v7
with:
@@ -52,7 +59,6 @@ jobs:
- name: Configure CMake
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} ^
-G "${{ matrix.generator }}" ^
-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^
@@ -62,5 +68,4 @@ jobs:
- name: Build
shell: cmd
run: |
- call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}