work on windows workflow

Author: henderkes

.github/workflows/windows.yaml

@@ -69,43 +69,42 @@ jobs:
         uses: actions/cache@v5
         with:
           path: |
-            ${{ env.VCPKG_INSTALLATION_ROOT }}\installed
+            frankenphp\vcpkg_installed
             ${{ env.VCPKG_INSTALLATION_ROOT }}\downloads
-          key: ${{ runner.os }}-vcpkg-libs-${{ hashFiles('vcpkg/ports/**') }}
+          key: ${{ runner.os }}-vcpkg-libs-${{ hashFiles('frankenphp/vcpkg.json') }}
           restore-keys: |
             ${{ runner.os }}-vcpkg-libs-
-          lookup-only: true
 
       - name: Install Vcpkg Libraries
         working-directory: frankenphp
-        run: '& "$env:VCPKG_INSTALLATION_ROOT\vcpkg.exe" install'
+        run: 'vcpkg install'
 
       - name: Download Watcher
         run: |
           $latestTag = gh release list --repo e-dant/watcher --limit 1 --exclude-drafts --exclude-pre-releases --json tagName --jq '.[0].tagName'
           Write-Host "Latest Watcher version: $latestTag"
 
-          gh release download $latestTag --repo e-dant/watcher --pattern "*x86_64-pc-windows-msvc.tar" --dir "$env:TEMP" -O watcher.tar
+          gh release download $latestTag --repo e-dant/watcher --pattern "*x86_64-pc-windows-msvc.tar" -O watcher.tar
 
-          tar -xf "$env:TEMP\watcher.tar" -C "$env:GITHUB_WORKSPACE"
+          tar -xf "watcher.tar" -C "$env:GITHUB_WORKSPACE"
           Rename-Item -Path "$env:GITHUB_WORKSPACE\x86_64-pc-windows-msvc" -NewName "watcher"
 
           # See https://github.com/e-dant/watcher/issues/108
-          New-Item -Path .\watcher\wtr -ItemType Directory
-          Move-Item -Path .\watcher-c.h -Destination .\watcher\wtr\watcher-c.h
+          New-Item -Path .\watcher\wtr -ItemType Directory -Force
+          Move-Item -Path .\watcher\watcher-c.h -Destination .\watcher\wtr\watcher-c.h
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Download PHP
         run: |
           $webContent = Invoke-WebRequest -Uri $env:PHP_DOWNLOAD_BASE -UseBasicParsing
-          $links = $webContent.Links.Href | Where-Object { $_ -match "php-(\d+\.\d+\.\d+)-Win32-vs17-x64\.zip" }
+          $links = $webContent.Links.Href | Where-Object { $_ -match "php-\d+\.\d+\.\d+-Win32-vs17-x64\.zip$" }
 
           if (-not $links) { throw "Could not find PHP zip files at $env:PHP_DOWNLOAD_BASE" }
 
-          $latestFile = $links | Sort-Object { [version]($_ -replace 'php-', '' -replace '-Win32-vs17-x64.zip', '') } | Select-Object -Last 1
+          $latestFile = $links | Sort-Object { if ($_ -match '(\d+\.\d+\.\d+)') { [version]$matches[1] } } | Select-Object -Last 1
 
-          $version = $latestFile -replace 'php-', '' -replace '-Win32-vs17-x64.zip', ''
+          $version = if ($latestFile -match '(\d+\.\d+\.\d+)') { $matches[1] }
           Write-Host "Detected latest PHP version: $version"
 
           "PHP_VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Append
@@ -121,30 +120,30 @@ jobs:
 
       - name: Prepare env
         run: |
-          $vcpkgRoot = "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows"
+          $vcpkgRoot = "$env:GITHUB_WORKSPACE\frankenphp\vcpkg_installed\x64-windows"
           $watcherRoot = "$env:GITHUB_WORKSPACE\watcher"
           $phpBin = "$env:GITHUB_WORKSPACE\php-bin"
           $phpDevel = "$env:GITHUB_WORKSPACE\php-devel\php-$env:PHP_VERSION-devel-vs17-x64"
 
           echo "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\Llvm\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
-          echo "$env:VCPKG_INSTALLATION_ROOT\watcher" | Out-File -FilePath $env:GITHUB_PATH -Append
+          echo "$vcpkgRoot\bin" | Out-File -FilePath $env:GITHUB_PATH -Append
+          echo "$env:GITHUB_WORKSPACE\watcher" | Out-File -FilePath $env:GITHUB_PATH -Append
           echo "$env:GITHUB_WORKSPACE\php-bin" | Out-File -FilePath $env:GITHUB_PATH -Append
 
           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
           echo "CGO_LDFLAGS=-L$vcpkgRoot\lib -lbrotlienc -L$watcherRoot -llibwatcher-c -L$phpBin -L$phpDevel\lib -lphp8ts -lphp8embed" | Out-File -FilePath $env:GITHUB_ENV -Append
 
       - name: Build FrankenPHP
         run: go build -ldflags '-extldflags="-fuse-ld=lld"' -tags nobadger,nomysql,nopgx
-        working-directory: ${{ env.GITHUB_WORKSPACE }}/frankenphp
+        working-directory: frankenphp\caddy\frankenphp
 
       - name: Create Zip Archive
         run: |
           Move-Item frankenphp\caddy\frankenphp\frankenphp.exe php-bin
           Move-Item watcher\libwatcher-c.dll php-bin
-          Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\bin\brotlienc.dll" php-bin
-          Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\bin\brotlicommon.dll" php-bin
-          Move-Item "$env:VCPKG_INSTALLATION_ROOT\installed\x64-windows\bin\pthreadVC3.dll" php-bin
+          Move-Item "frankenphp\vcpkg_installed\x64-windows\bin\brotlienc.dll" php-bin
+          Move-Item "frankenphp\vcpkg_installed\x64-windows\bin\brotlicommon.dll" php-bin
+          Move-Item "frankenphp\vcpkg_installed\x64-windows\bin\pthreadVC3.dll" php-bin
 
           $version = $env:PHP_VERSION
           $zipName = "frankenphp-php-$version-Win32-vs17-x64.zip"
@@ -176,4 +175,4 @@ jobs:
           go test -ldflags '-extldflags="-fuse-ld=lld"' ./...
           cd caddy
           go test -ldflags '-extldflags="-fuse-ld=lld"' -tags nobadger,nomysql,nopgx ./...
-        working-directory: ${{ env.GITHUB_WORKSPACE }}/frankenphp
+        working-directory: ${{ env.GITHUB_WORKSPACE }}\frankenphp

vcpkg.json

@@ -1,6 +1,3 @@
 {
-  "dependencies": [
-    "brotli",
-    "pthreads"
-  ]
+  "dependencies": ["brotli", "pthreads"]
 }