Skip to content

Commit f08f4bb

Browse files
committed
wip
1 parent 4bbe362 commit f08f4bb

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/windows.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,17 +60,11 @@ jobs:
6060
with:
6161
go-version: "1.26.0-rc.1"
6262
cache-dependency-path: |
63-
go.sum
64-
caddy/go.sum
63+
frankenphp/go.sum
64+
frankenphp/caddy/go.sum
6565
cache: false
6666
check-latest: true
6767

68-
- name: Update Vcpkg
69-
run: |
70-
cd "$env:VCPKG_INSTALLATION_ROOT"
71-
git pull
72-
.\bootstrap-vcpkg.bat
73-
7468
- name: Cache Vcpkg Packages
7569
uses: actions/cache@v5
7670
with:
@@ -83,16 +77,17 @@ jobs:
8377
lookup-only: true
8478

8579
- name: Install Vcpkg Libraries
86-
run: '& "$env:VCPKG_INSTALLATION_ROOT\vcpkg.exe" install pthreads brotli --triplet x64-windows'
80+
working-directory: frankenphp
81+
run: '& "$env:VCPKG_INSTALLATION_ROOT\vcpkg.exe" install'
8782

8883
- name: Download Watcher
8984
run: |
9085
$latestTag = gh release list --repo e-dant/watcher --limit 1 --exclude-drafts --exclude-pre-releases --json tagName --jq '.[0].tagName'
9186
Write-Host "Latest Watcher version: $latestTag"
9287
93-
gh release download $latestTag --repo e-dant/watcher --pattern "*x86_64-pc-windows-msvc.tar" --dir "$env:TEMP"
88+
gh release download $latestTag --repo e-dant/watcher --pattern "*x86_64-pc-windows-msvc.tar" --dir "$env:TEMP" -O watcher.tar
9489
95-
tar -xf "$env:TEMP\watcher-x86_64-pc-windows-msvc.tar" -C "$env:GITHUB_WORKSPACE"
90+
tar -xf "$env:TEMP\watcher.tar" -C "$env:GITHUB_WORKSPACE"
9691
Rename-Item -Path "$env:GITHUB_WORKSPACE\x86_64-pc-windows-msvc" -NewName "watcher"
9792
9893
# See https://github.com/e-dant/watcher/issues/108

vcpkg.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"dependencies": [
3+
"brotli",
4+
"pthreads"
5+
]
6+
}

0 commit comments

Comments
 (0)