From 13e592502fcf739504e897adeb887a6bc1e428a6 Mon Sep 17 00:00:00 2001
From: Ryan Walters <ryan@walters.to>
Date: Sun, 2 Nov 2025 09:57:02 -0600
Subject: [PATCH] fix: update vcpkg cache paths and web serve directory

Update GitHub Actions workflows to use correct Cargo.toml/Cargo.lock paths
in root directory instead of pacman/ subdirectory. Fix Justfile web command
to serve from web/dist/client instead of pacman/dist.
---
 .github/workflows/build.yaml    | 2 +-
 .github/workflows/checks.yaml   | 2 +-
 .github/workflows/coverage.yaml | 2 +-
 .github/workflows/tests.yaml    | 2 +-
 Justfile                        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 29f592a..e33e11b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -53,7 +53,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: target/vcpkg
-          key: A-vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('pacman/Cargo.toml', 'pacman/Cargo.lock') }}
+          key: A-vcpkg-${{ runner.os }}-${{ matrix.target }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           restore-keys: |
             A-vcpkg-${{ runner.os }}-${{ matrix.target }}-
 
diff --git a/.github/workflows/checks.yaml b/.github/workflows/checks.yaml
index 0c7c058..b22f746 100644
--- a/.github/workflows/checks.yaml
+++ b/.github/workflows/checks.yaml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: target/vcpkg
-          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('pacman/Cargo.toml', 'pacman/Cargo.lock') }}
+          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           restore-keys: |
             A-vcpkg-${{ runner.os }}-
 
diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml
index 14afe61..5c94171 100644
--- a/.github/workflows/coverage.yaml
+++ b/.github/workflows/coverage.yaml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: target/vcpkg
-          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('pacman/Cargo.toml', 'pacman/Cargo.lock') }}
+          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           restore-keys: |
             A-vcpkg-${{ runner.os }}-
 
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index d626301..8fa12a8 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: target/vcpkg
-          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('pacman/Cargo.toml', 'pacman/Cargo.lock') }}
+          key: A-vcpkg-${{ runner.os }}-${{ hashFiles('Cargo.toml', 'Cargo.lock') }}
           restore-keys: |
             A-vcpkg-${{ runner.os }}-
 
diff --git a/Justfile b/Justfile
index 8c96fb3..704b093 100644
--- a/Justfile
+++ b/Justfile
@@ -37,7 +37,7 @@ samply:
 # Build the project for Emscripten
 web *args:
 	bun run pacman/web.build.ts {{args}};
-	caddy file-server --root pacman/dist
+	caddy file-server --root web/dist/client
 
 # Fix linting errors & formatting
 fix: