@@ -69,15 +69,15 @@ jobs:
6969 uses : actions/cache@v5
7070 with :
7171 path : |
72- ${{ env.VCPKG_INSTALLATION_ROOT }}\installed
72+ frankenphp\vcpkg_installed
7373 ${{ env.VCPKG_INSTALLATION_ROOT }}\downloads
7474 key : ${{ runner.os }}-vcpkg-libs-${{ hashFiles('frankenphp/vcpkg.json') }}
7575 restore-keys : |
7676 ${{ runner.os }}-vcpkg-libs-
7777
7878 - name : Install Vcpkg Libraries
7979 working-directory : frankenphp
80- run : ' & "$env:VCPKG_INSTALLATION_ROOT\ vcpkg.exe" install'
80+ run : ' vcpkg install'
8181
8282 - name : Download Watcher
8383 run : |
@@ -120,13 +120,13 @@ jobs:
120120
121121 - name : Prepare env
122122 run : |
123- $vcpkgRoot = "$env:VCPKG_INSTALLATION_ROOT\installed \x64-windows"
123+ $vcpkgRoot = "$env:GITHUB_WORKSPACE\frankenphp\vcpkg_installed \x64-windows"
124124 $watcherRoot = "$env:GITHUB_WORKSPACE\watcher"
125125 $phpBin = "$env:GITHUB_WORKSPACE\php-bin"
126126 $phpDevel = "$env:GITHUB_WORKSPACE\php-devel\php-$env:PHP_VERSION-devel-vs17-x64"
127127
128128 echo "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
129- echo "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows \bin" | Out-File -FilePath $env:GITHUB_PATH -Append
129+ echo "$vcpkgRoot \bin" | Out-File -FilePath $env:GITHUB_PATH -Append
130130 echo "$env:GITHUB_WORKSPACE\watcher" | Out-File -FilePath $env:GITHUB_PATH -Append
131131 echo "$env:GITHUB_WORKSPACE\php-bin" | Out-File -FilePath $env:GITHUB_PATH -Append
132132
@@ -141,9 +141,9 @@ jobs:
141141 run : |
142142 Move-Item frankenphp\caddy\frankenphp\frankenphp.exe php-bin
143143 Move-Item watcher\libwatcher-c.dll php-bin
144- Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed \x64-windows\bin\brotlienc.dll" php-bin
145- Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed \x64-windows\bin\brotlicommon.dll" php-bin
146- Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed \x64-windows\bin\pthreadVC3.dll" php-bin
144+ Move-Item "frankenphp\vcpkg_installed \x64-windows\bin\brotlienc.dll" php-bin
145+ Move-Item "frankenphp\vcpkg_installed \x64-windows\bin\brotlicommon.dll" php-bin
146+ Move-Item "frankenphp\vcpkg_installed \x64-windows\bin\pthreadVC3.dll" php-bin
147147
148148 $version = $env:PHP_VERSION
149149 $zipName = "frankenphp-php-$version-Win32-vs17-x64.zip"
0 commit comments