workflows bugfix overridden VCPKG_ROOT

silverqx · Sep 10, 2023 · dfc5662 · dfc5662
1 parent 9ad4200
commit dfc5662
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
@@ -528,17 +528,18 @@ jobs:
         ccache.exe --version
         Write-Output '::endgroup::'
 
+    - name: Visual Studio 2022 pwsh shell setup
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    # Must be after the ilammy/msvc-dev-cmd@v1 because vcvars64 override the VCPKG_ROOT
     - name: vcpkg set-up environment
       run: |
         "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" >> $env:GITHUB_ENV
         'VCPKG_DEFAULT_TRIPLET=x64-windows' >> $env:GITHUB_ENV
         'VCPKG_MAX_CONCURRENCY=2' >> $env:GITHUB_ENV
 
-    - name: Visual Studio 2022 pwsh shell setup
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
     - name: CMake print version
       run: |
         cmake.exe --version

diff --git a/.github/workflows/msvc2019-qt5.yml b/.github/workflows/msvc2019-qt5.yml
@@ -377,17 +377,18 @@ jobs:
         ccache.exe --version
         Write-Output '::endgroup::'
 
+    - name: Visual Studio 2019 pwsh shell setup
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    # Must be after the ilammy/msvc-dev-cmd@v1 because vcvars64 override the VCPKG_ROOT
     - name: vcpkg set-up environment
       run: |
         "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" >> $env:GITHUB_ENV
         'VCPKG_DEFAULT_TRIPLET=x64-windows' >> $env:GITHUB_ENV
         'VCPKG_MAX_CONCURRENCY=2' >> $env:GITHUB_ENV
 
-    - name: Visual Studio 2019 pwsh shell setup
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
     - name: CMake print version
       run: |
         cmake.exe --version

diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml
@@ -525,17 +525,18 @@ jobs:
         ccache.exe --version
         Write-Output '::endgroup::'
 
+    - name: Visual Studio 2022 pwsh shell setup
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+
+    # Must be after the ilammy/msvc-dev-cmd@v1 because vcvars64 override the VCPKG_ROOT
     - name: vcpkg set-up environment
       run: |
         "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" >> $env:GITHUB_ENV
         'VCPKG_DEFAULT_TRIPLET=x64-windows' >> $env:GITHUB_ENV
         'VCPKG_MAX_CONCURRENCY=2' >> $env:GITHUB_ENV
 
-    - name: Visual Studio 2022 pwsh shell setup
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-
     - name: CMake print version
       run: |
         cmake.exe --version