Merge pull request #327 from Xiangyu-Hu/windows-ci-fix

test windows ci
Xiangyu-Hu · Jun 9, 2023 · 7b3405a · 7b3405a
2 parents 350ef8f + e6ce8c7
commit 7b3405a
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,10 +44,11 @@ jobs:
         with:
           key: ${{ github.job }}
 
-      - uses: friendlyanon/setup-vcpkg@v1 # Setup vcpkg into ${{github.workspace}}
-        with: 
-          committish: ${{ env.VCPKG_VERSION }}
-          cache-version: ${{env.VCPKG_VERSION}}
+      - uses: lukka/run-vcpkg@v11
+        with:
+          # hash for tag 2023.04.15 - bugged so use more recent
+          # https://github.com/microsoft/vcpkg/pull/29067
+          vcpkgGitCommitId: "1c5a340f6e10985e2d92af174a68dbd15c1fa4e1"
 
       - name: Install dependencies
         run: |
@@ -134,10 +135,11 @@ jobs:
         with:
           key: ${{ github.job }}
 
-      - uses: friendlyanon/setup-vcpkg@v1 # Setup vcpkg into ${{github.workspace}}
-        with: 
-          committish: ${{ env.VCPKG_VERSION }}
-          cache-version: ${{env.VCPKG_VERSION}}
+      - uses: lukka/run-vcpkg@v11
+        with:
+          # hash for tag 2023.04.15 - bugged so use more recent
+          # https://github.com/microsoft/vcpkg/pull/29067
+          vcpkgGitCommitId: "1c5a340f6e10985e2d92af174a68dbd15c1fa4e1"
 
       - name: Install dependencies
         run: |
@@ -230,10 +232,11 @@ jobs:
         with:
           key: ${{ github.job }}
 
-      - uses: friendlyanon/setup-vcpkg@v1 # Setup vcpkg into ${{github.workspace}}
-        with: 
-          committish: ${{ env.VCPKG_VERSION }}
-          cache-version: ${{env.VCPKG_VERSION}}
+      - uses: lukka/run-vcpkg@v11
+        with:
+          # hash for tag 2023.04.15 - bugged so use more recent
+          # https://github.com/microsoft/vcpkg/pull/29067
+          vcpkgGitCommitId: "1c5a340f6e10985e2d92af174a68dbd15c1fa4e1"
 
       - name: Install dependencies
         run: |
@@ -296,4 +299,4 @@ jobs:
         if: ${{ steps.fourth-try.outcome == 'failure' }} 
         run: |
           cd build 
-          ctest --rerun-failed --output-on-failure
+          ctest --rerun-failed --output-on-failure