updates to cmake build for windows

blade-lang · Sep 19, 2024 · d2def1b · d2def1b
1 parent d84eef8
commit d2def1b
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -82,32 +82,32 @@ jobs:
       - uses: actions/checkout@v4
       - uses: friendlyanon/setup-vcpkg@v1
         with: { committish: 3508985146f1b1d248c67ead13f8f54be5b4f5da, cache-version: "1", cache-key: "vcpkg-windows", cache-restore-keys: "vcpkg-windows" }
-      # - name: Restore vcpkg dependencies cache
-      #   id: vcpkg-cache-restore
-      #   uses: actions/cache/restore@v4
-      #   with:
-      #     path: |
-      #       ${{ env.VCPKG_ROOT }}/ports
-      #       ${{ env.VCPKG_ROOT }}/downloads
-      #       ${{ env.VCPKG_ROOT }}/installed
-      #       ${{ env.VCPKG_ROOT }}/vcpkg_installed
-      #     key: ${{ runner.OS }}-vcpkg-cache
+      - name: Restore vcpkg dependencies cache
+        id: vcpkg-cache-restore
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ${{ env.VCPKG_ROOT }}/ports
+            ${{ env.VCPKG_ROOT }}/downloads
+            ${{ env.VCPKG_ROOT }}/installed
+            ${{ env.VCPKG_ROOT }}/vcpkg_installed
+          key: ${{ runner.OS }}-vcpkg-cache
       - name: Install Dependencies
         run: |
           ${{ env.VCPKG_ROOT }}/vcpkg update
           ${{ env.VCPKG_ROOT }}/vcpkg version
           ${{ env.VCPKG_ROOT }}/vcpkg install curl:x64-windows libffi:x64-windows openssl:x64-windows libgd:x64-windows
           ${{ env.VCPKG_ROOT }}/vcpkg list
-      # - name: Save vcpkg dependencies cache
-      #   id: vcpkg-cache-save
-      #   uses: actions/cache/save@v4
-      #   with:
-      #     path: |
-      #       ${{ env.VCPKG_ROOT }}/ports
-      #       ${{ env.VCPKG_ROOT }}/downloads
-      #       ${{ env.VCPKG_ROOT }}/installed
-      #       ${{ env.VCPKG_ROOT }}/vcpkg_installed
-      #     key: ${{ steps.vcpkg-cache-restore.outputs.cache-primary-key }}
+      - name: Save vcpkg dependencies cache
+        id: vcpkg-cache-save
+        uses: actions/cache/save@v4
+        with:
+          path: |
+            ${{ env.VCPKG_ROOT }}/ports
+            ${{ env.VCPKG_ROOT }}/downloads
+            ${{ env.VCPKG_ROOT }}/installed
+            ${{ env.VCPKG_ROOT }}/vcpkg_installed
+          key: ${{ steps.vcpkg-cache-restore.outputs.cache-primary-key }}
       - name: Compile
         run: |
           cmake -B . -G "Unix Makefiles" -DCMAKE_MAKE_PROGRAM=mingw32-make -DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" -DOPENSSL_ROOT_DIR=${{ env.VCPKG_ROOT }}/installed/x64-windows-static