Skip to content

Commit 14abf14

Browse files
committed
work on windows workflow
1 parent 6adbb6c commit 14abf14

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/windows.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ jobs:
6969
uses: actions/cache@v5
7070
with:
7171
path: |
72-
${{ env.VCPKG_ROOT }}\installed
73-
${{ env.VCPKG_ROOT }}\downloads
72+
${{ env.VCPKG_INSTALLED_ROOT }}\installed
73+
${{ env.VCPKG_INSTALLED_ROOT }}\downloads
7474
key: ${{ runner.os }}-vcpkg-libs-${{ hashFiles('vcpkg/ports/**') }}
7575
restore-keys: |
7676
${{ runner.os }}-vcpkg-libs-
7777
lookup-only: true
7878

7979
- name: Install Vcpkg Libraries
8080
working-directory: frankenphp
81-
run: '& "$env:VCPKG_ROOT\vcpkg.exe" install'
81+
run: '& "$env:VCPKG_INSTALLED_ROOT\vcpkg.exe" install'
8282

8383
- name: Download Watcher
8484
run: |
@@ -121,14 +121,14 @@ jobs:
121121
122122
- name: Prepare env
123123
run: |
124-
$vcpkgRoot = "$env:VCPKG_ROOT\installed\x64-windows"
124+
$vcpkgRoot = "$env:VCPKG_INSTALLED_ROOT\installed\x64-windows"
125125
$watcherRoot = "$env:GITHUB_WORKSPACE\watcher"
126126
$phpBin = "$env:GITHUB_WORKSPACE\php-bin"
127127
$phpDevel = "$env:GITHUB_WORKSPACE\php-devel\php-$env:PHP_VERSION-devel-vs17-x64"
128128
129129
echo "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
130-
echo "$env:VCPKG_ROOT\installed\x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
131-
echo "$env:VCPKG_ROOT\watcher" | Out-File -FilePath $env:GITHUB_PATH -Append
130+
echo "$env:VCPKG_INSTALLED_ROOT\installed\x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
131+
echo "$env:VCPKG_INSTALLED_ROOT\watcher" | Out-File -FilePath $env:GITHUB_PATH -Append
132132
echo "$env:GITHUB_WORKSPACE\php-bin" | Out-File -FilePath $env:GITHUB_PATH -Append
133133
134134
echo "CGO_CFLAGS=-I$vcpkgRoot\include -I$watcherRoot -I$phpDevel\include -I$phpDevel\include\main -I$phpDevel\include\TSRM -I$phpDevel\include\Zend -I$phpDevel\include\ext" | Out-File -FilePath $env:GITHUB_ENV -Append
@@ -142,9 +142,9 @@ jobs:
142142
run: |
143143
Move-Item frankenphp\caddy\frankenphp\frankenphp.exe php-bin
144144
Move-Item watcher\libwatcher-c.dll php-bin
145-
Move-Item "$env:VCPKG_ROOT\installed\x64-windows\bin\brotlienc.dll" php-bin
146-
Move-Item "$env:VCPKG_ROOT\installed\x64-windows\bin\brotlicommon.dll" php-bin
147-
Move-Item "$env:VCPKG_ROOT\installed\x64-windows\bin\pthreadVC3.dll" php-bin
145+
Move-Item "$env:VCPKG_INSTALLED_ROOT\installed\x64-windows\bin\brotlienc.dll" php-bin
146+
Move-Item "$env:VCPKG_INSTALLED_ROOT\installed\x64-windows\bin\brotlicommon.dll" php-bin
147+
Move-Item "$env:VCPKG_INSTALLED_ROOT\installed\x64-windows\bin\pthreadVC3.dll" php-bin
148148
149149
$version = $env:PHP_VERSION
150150
$zipName = "frankenphp-php-$version-Win32-vs17-x64.zip"

0 commit comments

Comments
 (0)