CI: Switch to using libhsplasma from vcpkg rather than building it ou…

…rselves.
H-uru · Jun 12, 2023 · 8b4ea55 · 8b4ea55
1 parent f37a1f7
commit 8b4ea55
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 22 deletions.
diff --git a/.github/workflows/windows-ci.yaml b/.github/workflows/windows-ci.yaml
@@ -42,11 +42,11 @@ jobs:
         id: cache-vcpkg
         uses: actions/cache@v3
         with:
-          path: C:\vcpkg\installed
+          path: ${{ github.workspace }}\vcpkg_installed
           key: |
-            vcpkg-triplet=${{ matrix.cfg.triplet }} vcpkg-response=${{ hashFiles('vcpkg.txt') }} vcpkg-rev=${{ steps.bootstrap-vcpkg.outputs.vcpkg-rev }}
+            vcpkg-triplet=${{ matrix.cfg.triplet }} vcpkg-response=${{ hashFiles('vcpkg.json') }} vcpkg-rev=${{ steps.bootstrap-vcpkg.outputs.vcpkg-rev }}
           restore-keys: |
-            vcpkg-triplet=${{ matrix.cfg.triplet }} vcpkg-response=${{ hashFiles('vcpkg.txt') }}
+            vcpkg-triplet=${{ matrix.cfg.triplet }} vcpkg-response=${{ hashFiles('vcpkg.json') }}
             vcpkg-triplet=${{ matrix.cfg.triplet }}
 
       - name: Upgrade Dependencies
@@ -115,25 +115,6 @@ jobs:
           cmake --build . --config Release -j 2
           cmake --build . --config Release --target INSTALL
 
-      - name: Checkout HSPlasma
-        uses: actions/checkout@v3
-        with:
-          repository: H-uru/libhsplasma
-          path: libhsplasma
-
-      - name: Build libHSPlasma
-        run: |
-          cd libhsplasma
-          mkdir build && cd build
-          cmake `
-            -G "${{ matrix.cfg.generator }}" -A ${{ matrix.cfg.cmake-arch }} `
-            -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake `
-            -DVCPKG_TARGET_TRIPLET=${{ matrix.cfg.triplet }} `
-            -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\install `
-            -DENABLE_PYTHON=OFF -DENABLE_TOOLS=OFF -DENABLE_NET=OFF -DENABLE_PHYSX=OFF ..
-          cmake --build . --config Release -j 2
-          cmake --build . --config Release --target INSTALL
-
       - name: Build PlasmaShop
         run: |
           mkdir build && cd build

diff --git a/vcpkg.json b/vcpkg.json
@@ -4,6 +4,11 @@
   "version-string": "3.0",
   "description": "Swiss army knife for Plasma file hacking",
   "dependencies": [
+    {
+      "name": "libhsplasma",
+      "default-features": false,
+      "features": []
+    },
     "libjpeg-turbo",
     "libpng",
     "string-theory",