Update build.yml

1 files changed, 35 insertions, 36 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e9fa52..2574694 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
           restore-keys: vcpkg-${{github.job}}-
 
       - name: vcpkg
@@ -79,12 +79,6 @@ jobs:
           vcpkgJsonGlob: '**/source/vcpkg.json'
           vcpkgConfigurationJsonGlob: '**/source/vcpkg-configuration.json'
 
-      - name: Save VCPKG cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
-
       - name: Run CMake
         uses: lukka/run-cmake@v10
         with:
@@ -106,6 +100,12 @@ jobs:
         with:
           name: OpenStarbound-Windows-All-DevOnly
           path: dist/*
+      
+      - name: Save VCPKG cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
 
       - name: Upload Client
         uses: actions/upload-artifact@v4
@@ -162,7 +162,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
           restore-keys: vcpkg-${{github.job}}-
 
       - name: vcpkg
@@ -172,12 +172,6 @@ jobs:
           vcpkgJsonGlob: '**/source/vcpkg.json'
           vcpkgConfigurationJsonGlob: '**/source/vcpkg-configuration.json'
 
-      - name: Save VCPKG cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
-
       - name: Run CMake
         uses: lukka/run-cmake@v10
         with:
@@ -194,6 +188,12 @@ jobs:
         with:
           name: OpenStarbound-Linux-GCC
           path: dist.tar
+      
+      - name: Save VCPKG cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
 
       - name: Run Tests
         uses: lukka/run-cmake@v10
@@ -251,7 +251,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
           restore-keys: vcpkg-${{github.job}}-
 
       - name: vcpkg
@@ -261,12 +261,6 @@ jobs:
           vcpkgJsonGlob: '**/source/vcpkg.json'
           vcpkgConfigurationJsonGlob: '**/source/vcpkg-configuration.json'
 
-      - name: Save VCPKG cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
-
       - name: Run CMake
         uses: lukka/run-cmake@v10
         with:
@@ -283,6 +277,12 @@ jobs:
         with:
           name: OpenStarbound-Linux-Clang
           path: dist.tar
+      
+      - name: Save VCPKG cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
 
       - name: Run Tests
         uses: lukka/run-cmake@v10
@@ -333,7 +333,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
           restore-keys: vcpkg-${{github.job}}-
 
       - name: vcpkg
@@ -343,12 +343,6 @@ jobs:
           vcpkgJsonGlob: '**/source/vcpkg.json'
           vcpkgConfigurationJsonGlob: '**/source/vcpkg-configuration.json'
 
-      - name: Save VCPKG cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
-
       - name: Run CMake
         uses: lukka/run-cmake@v10
         with:
@@ -362,7 +356,12 @@ jobs:
         with:
           name: OpenStarbound-macOS-Intel
           path: dist/*
-
+      
+      - name: Save VCPKG cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
   build-mac-arm:
     name: Build OpenStarbound macOS arm64
     runs-on: macos-14
@@ -390,7 +389,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}
           restore-keys: vcpkg-${{github.job}}-
 
       - name: vcpkg
@@ -400,12 +399,6 @@ jobs:
           vcpkgJsonGlob: '**/source/vcpkg.json'
           vcpkgConfigurationJsonGlob: '**/source/vcpkg-configuration.json'
 
-      - name: Save VCPKG cache
-        uses: actions/cache/save@v4
-        with:
-          path: ${{ github.workspace }}/vcpkg_cache
-          key: vcpkg-${{github.job}}-${{ hashFiles('vcpkg.json') }}
-
       - name: Run CMake
         uses: lukka/run-cmake@v10
         with:
@@ -419,3 +412,9 @@ jobs:
         with:
           name: OpenStarbound-macOS-Silicon
           path: dist/*
+
+      - name: Save VCPKG cache
+        uses: actions/cache/save@v4
+        with:
+          path: ${{ github.workspace }}/vcpkg_cache
+          key: vcpkg-${{github.job}}-${{ hashFiles('**/source/vcpkg.json') }}