try

MerginMaps · Aug 4, 2023 · a2f40ed · a2f40ed
1 parent b2976b3
commit a2f40ed
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -95,7 +95,6 @@ jobs:
           set-env: false
 
       - name: Get vcpkg
-        if: steps.cache-vcpkg-restore.outputs.cache-hit != 'true'
         shell: bash
         run: |
           mkdir -p "${{ env.VCPKG_ROOT }}"
@@ -105,9 +104,13 @@ jobs:
           git pull origin master
           git checkout $VCPKG_BASELINE
 
+      - name: Install vcpkg
+        run: |
           echo "install vcpkg"
+          cd "${{ env.VCPKG_ROOT }}"
           chmod +x ./bootstrap-vcpkg.sh
           ./bootstrap-vcpkg.sh
+          ./vcpkg --version
 
       - name: Build Deps
         run: |

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -66,7 +66,6 @@ jobs:
           set-env: false
 
       - name: Get vcpkg
-        if: steps.cache-vcpkg-restore.outputs.cache-hit != 'true'
         shell: bash
         run: |
           mkdir -p "${{ env.VCPKG_ROOT }}"
@@ -76,7 +75,10 @@ jobs:
           git pull origin master
           git checkout $VCPKG_BASELINE
 
+      - name: Install vcpkg
+        run: |
           echo "install vcpkg"
+          cd "${{ env.VCPKG_ROOT }}"
           chmod +x ./bootstrap-vcpkg.sh
           ./bootstrap-vcpkg.sh
           ./vcpkg --version

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -49,7 +49,6 @@ jobs:
           dir: ${{ github.workspace }}
 
       - name: Get vcpkg
-        if: steps.cache-vcpkg-restore.outputs.cache-hit != 'true'
         shell: bash
         run: |
           mkdir -p "${{ env.VCPKG_ROOT }}"
@@ -59,7 +58,10 @@ jobs:
           git pull origin master
           git checkout $VCPKG_BASELINE
           
+      - name: Install vcpkg
+        run: |
           echo "install vcpkg"
+          cd "${{ env.VCPKG_ROOT }}"
           chmod +x ./bootstrap-vcpkg.sh
           ./bootstrap-vcpkg.sh
           ./vcpkg --version

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -56,7 +56,6 @@ jobs:
           xcode-version: ${{ env.XC_VERSION }}
 
       - name: Get vcpkg
-        if: steps.cache-vcpkg-restore.outputs.cache-hit != 'true'
         shell: bash
         run: |
           mkdir -p "${{ env.VCPKG_ROOT }}"
@@ -66,7 +65,10 @@ jobs:
           git pull origin master
           git checkout $VCPKG_BASELINE
 
+      - name: Install vcpkg
+        run: |
           echo "install vcpkg"
+          cd "${{ env.VCPKG_ROOT }}"
           chmod +x ./bootstrap-vcpkg.sh
           ./bootstrap-vcpkg.sh
           ./vcpkg --version