CI: checkout before vcpkg install (checkout may clean the folder)

pthom · Apr 25, 2024 · 02ad577 · 02ad577
1 parent 14a5915
commit 02ad577
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py b/.github/ci_vcpkg_package_tests/run_ci_vcpkg_package_tests.py
@@ -1,3 +1,4 @@
+import logging
 import subprocess
 import platform
 import os
@@ -45,6 +46,28 @@ def run_test_with_rendering_backend(rendering_backend: str) -> bool:
     if platform.system() == "Windows":
         copy_mesa_libs_to_current_dir()
 
+    def find_vcpkg_program() -> str:
+        possible_vcpkg_roots = [f"{REPO_DIR}/vcpkg"]
+        if "VCPKG_ROOT" in os.environ:
+            logging.info(f"Found VCPKG_ROOT in environment variables: {os.environ['VCPKG_ROOT']})
+            possible_vcpkg_roots.append(os.environ["VCPKG_ROOT"])
+        if "VCPKG_INSTALLATION_ROOT" in os.environ:
+            logging.info(f"Found VCPKG_INSTALLATION_ROOT in environment variables: {os.environ['VCPKG_INSTALLATION_ROOT']})
+            possible_vcpkg_roots.append(os.environ["VCPKG_INSTALLATION_ROOT"])
+
+        r = ""
+        for possible_vcpkg_root in possible_vcpkg_roots:
+            possible_vcpkg_program = os.path.join(possible_vcpkg_root, "vcpkg")
+            if os.path.exists(possible_vcpkg_program):
+                r = possible_vcpkg_program
+                break
+        if len(r) == 0:
+            print(f"Could not find vcpkg program, tried {possible_vcpkg_roots}")
+            sys.exit(1)
+        return r
+
+    vcpkg_program = find_vcpkg_program()
+
     if "VCPKG_ROOT" in os.environ:
         vcpkg_root = os.environ["VCPKG_ROOT"]
     elif "VCPKG_INSTALLATION_ROOT" in os.environ:

diff --git a/.github/workflows/t/VcpkgDeps.yml → .github/workflows/VcpkgDeps.yml b/.github/workflows/t/VcpkgDeps.yml → .github/workflows/VcpkgDeps.yml
@@ -25,6 +25,10 @@ jobs:
 
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
       - name: install glfw & sdl requirements
         if : ${{ matrix.config.os == 'ubuntu-latest' }}
         shell: bash
@@ -35,18 +39,12 @@ jobs:
         uses: johnwason/vcpkg-action@v6
         id: vcpkg
         with:
-          pkgs: 'nlohmann-json' # unrelated package, just to make the action happy
           triplet: ${{ matrix.config.vcpkg_triplet }}
           cache-key: ${{ matrix.config.os }}
           revision: master
           token: ${{ github.token }}
           github-binarycache: true
 
-
-      - uses: actions/checkout@v4
-        with:
-          submodules: true
-
 #      - name: Setup interactive tmate session
 #        uses: mxschmitt/action-tmate@v3
 

diff --git a/.github/workflows/VcpkgPackage.yml b/.github/workflows/VcpkgPackage.yml
@@ -26,15 +26,19 @@ jobs:
       fail-fast: false
       matrix:
         config:
-#          - os: ubuntu-latest
-#            vcpkg_triplet: x64-linux-release
+          - os: ubuntu-latest
+            vcpkg_triplet: x64-linux-release
           - os: macos-latest
             vcpkg_triplet: x64-osx-release
-#          - os: windows-latest
-#            vcpkg_triplet: x64-windows-release
+          - os: windows-latest
+            vcpkg_triplet: x64-windows-release
 
 
     steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: false
+
       - name: install glfw & sdl requirements
         if : ${{ matrix.config.os == 'ubuntu-latest' }}
         shell: bash
@@ -45,17 +49,12 @@ jobs:
         uses: johnwason/vcpkg-action@v6
         id: vcpkg
         with:
-          pkgs: 'nlohmann-json' # unrelated package, just to make the action happy
           triplet: ${{ matrix.config.vcpkg_triplet }}
           cache-key: ${{ matrix.config.os }}
           revision: master
           token: ${{ github.token }}
           github-binarycache: true
 
-      - uses: actions/checkout@v4
-        with:
-          submodules: false
-
       #
       # Install utilities to be able to run a graphical OpenGL application
       #
@@ -74,8 +73,8 @@ jobs:
           # Extract the archive using 7-zip which is preinstalled on the GitHub Actions Windows runner
           7z x mesa3d-23.1.9-release-msvc.7z -omesa3d
 
-      - name: Setup interactive tmate session
-        uses: mxschmitt/action-tmate@v3
+#      - name: Setup interactive tmate session
+#        uses: mxschmitt/action-tmate@v3
 
         # Run the test
       - name: run test