CI: Update vcpkg during CI system initialization.

vectorgraphics · Apr 14, 2024 · 4ba87c6 · 4ba87c6
1 parent 639737f
commit 4ba87c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.github/actions/initialize-linux-env/action.yml b/.github/actions/initialize-linux-env/action.yml
@@ -13,9 +13,12 @@ runs:
  - name: Setup OpenGL
  shell: bash
  run: sudo apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev
+ - name: Run git fetch on vcpkg
+ shell: bash
+ run: cd "$VCPKG_INSTALLATION_ROOT" && git checkout . && git fetch && git pull && ./bootstrap-vcpkg.sh
  - name: Cache Vcpkg
  id: cache-vcpkg
  uses: actions/cache@v3
  with:
  path: ~/.cache/vcpkg/archives
- key: ${{ runner.os }}-vcpkg-cache
+ key: ${{ runner.os }}-vcpkg-cache
diff --git a/.github/actions/initialize-windows-env/action.yml b/.github/actions/initialize-windows-env/action.yml
@@ -7,6 +7,14 @@ runs:
  uses: ashutoshvarma/[email protected]
  with:
  version: 1.10.0
+ - name: Update vcpkg
+ shell: pwsh
+ run: |
+ Push-Location "$env:VCPKG_INSTALLATION_ROOT"
+ git fetch
+ git pull
+ ./bootstrap-vcpkg.bat
+ Pop-Location
  - name: Cache Vcpkg
  id: cache-vcpkg
  uses: actions/cache@v3