Added correct behavior

microsoft · Jan 31, 2025 · b05cbd8 · b05cbd8
1 parent ff42cd0
commit b05cbd8
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 4 deletions.
diff --git a/.github/workflows/bvt.yml b/.github/workflows/bvt.yml
@@ -81,11 +81,21 @@ jobs:
             echo "::error Unknown architecture/build-type triplet mapping"
         }
 
+    - name: Get latest vcpkg commit hash
+      shell: pwsh
+      run: |
+        echo "Fetching latest vcpkg commit hash..."
+        git clone https://github.com/microsoft/vcpkg.git ${{ runner.workspace }}/vcpkg
+        Set-Location ${{ runner.workspace }}/vcpkg
+        $VCPKG_COMMIT_ID= git rev-parse HEAD
+        Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+        echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+
     - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
       with:
         runVcpkgInstall: true
         vcpkgJsonGlob: '**/build/vcpkg.json'
-        vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}'
+        vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
 
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -121,11 +121,21 @@ jobs:
             echo "::error Unknown architecture/build-type triplet mapping"
         }
 
+    - name: Get latest vcpkg commit hash
+      shell: pwsh
+      run: |
+        echo "Fetching latest vcpkg commit hash..."
+        git clone https://github.com/microsoft/vcpkg.git ${{ runner.workspace }}/vcpkg
+        Set-Location ${{ runner.workspace }}/vcpkg
+        $VCPKG_COMMIT_ID= git rev-parse HEAD
+        Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+        echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+
     - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
       with:
         runVcpkgInstall: true
         vcpkgJsonGlob: '**/build/vcpkg.json'
-        vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}'
+        vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
 
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}

diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml
@@ -93,11 +93,21 @@ jobs:
             echo "::error Unknown architecture/build-type triplet mapping"
         }
 
+    - name: Get latest vcpkg commit hash
+      shell: pwsh
+      run: |
+        echo "Fetching latest vcpkg commit hash..."
+        git clone https://github.com/microsoft/vcpkg.git ${{ runner.workspace }}/vcpkg
+        Set-Location ${{ runner.workspace }}/vcpkg
+        $VCPKG_COMMIT_ID= git rev-parse HEAD
+        Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+        echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+
     - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
       with:
         runVcpkgInstall: true
         vcpkgJsonGlob: '**/build/vcpkg.json'
-        vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}'
+        vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
 
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}

diff --git a/.github/workflows/wsl.yml b/.github/workflows/wsl.yml
@@ -37,11 +37,21 @@ jobs:
 
     - uses: seanmiddleditch/gha-setup-ninja@96bed6edff20d1dd61ecff9b75cc519d516e6401 # v5
 
+    - name: Get latest vcpkg commit hash
+      shell: pwsh
+      run: |
+        echo "Fetching latest vcpkg commit hash..."
+        git clone https://github.com/microsoft/vcpkg.git ${{ runner.workspace }}/vcpkg
+        Set-Location ${{ runner.workspace }}/vcpkg
+        $VCPKG_COMMIT_ID= git rev-parse HEAD
+        Write-Host "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID"
+        echo "VCPKG_COMMIT_ID=$VCPKG_COMMIT_ID" >> $env:GITHUB_ENV
+
     - uses: lukka/run-vcpkg@7d259227a1fb6471a0253dd5ab7419835228f7d7 # v11
       with:
         runVcpkgInstall: true
         vcpkgJsonGlob: '**/build/vcpkg.json'
-        vcpkgGitCommitId: '${{ vars.VCPKG_COMMIT_ID }}'
+        vcpkgGitCommitId: '${{ env.VCPKG_COMMIT_ID }}'
 
     - name: 'Configure CMake'
       working-directory: ${{ github.workspace }}