Fix variable

ManiVaultStudio · Sep 20, 2024 · 7374f22 · 7374f22
1 parent 090bfb3
commit 7374f22
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,6 @@ env:
   BUILD_TYPE: Release
   MACENABLED: ${{ inputs.forceMacBuild }}
   USERNAME: ManiVaultStudio
-  VCPKG_ROOT: ${{ github.workspace }}/vcpkg
-  VCPKG_EXE: ${{ VCPKG_INSTALLATION_ROOT }}/vcpkg
   FEED_URL: https://nuget.pkg.github.com/ManiVaultStudio/index.json
   VCPKG_BINARY_SOURCES: "clear;nuget,https://nuget.pkg.github.com/ManiVaultStudio/index.json,readwrite"
 
@@ -85,41 +83,41 @@ jobs:
       - name: Install vcpkg 
         if: startsWith(matrix.os, 'windows')
         shell: pwsh
-        run: ${{ VCPKG_ROOT }}/bootstrap-vcpkg.bat
+        run: ${{ VCPKG_INSTALLATION_ROOT }}/bootstrap-vcpkg.bat
 
       - name: Install vcpkg
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
         shell: bash
-        run: ${{ VCPKG_ROOT }}/bootstrap-vcpkg.sh 
+        run: ${{ VCPKG_INSTALLATION_ROOT }}/bootstrap-vcpkg.sh 
 
     # Add NuGet sources
       - name: Add NuGet sources
         if: startsWith(matrix.os, 'windows')
         shell: pwsh
         run: |
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          .$(${{ env.VCPKG_INSTALLATION_ROOT }}/vcpkg.exe fetch nuget) `
             sources add `
             -Source "${{ env.FEED_URL }}" `
             -StorePasswordInClearText `
             -Name GitHubPackages `
             -UserName "${{ env.USERNAME }}" `
             -Password "${{ secrets.GH_PACKAGES_TOKEN }}"
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          .$(${{ env.VCPKG_INSTALLATION_ROOT }}/vcpkg.exe fetch nuget) `
             setapikey "${{ secrets.GH_PACKAGES_TOKEN }}" `
             -Source "${{ env.FEED_URL }}"
 
       - name: Add NuGet sources
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
         shell: bash
         run: |
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          .$(${{ env.VCPKG_INSTALLATION_ROOT }}/vcpkg fetch nuget) `
             sources add `
             -Source "${{ env.FEED_URL }}" `
             -StorePasswordInClearText `
             -Name GitHubPackages `
             -UserName "${{ env.USERNAME }}" `
             -Password "${{ secrets.GH_PACKAGES_TOKEN }}"
-          .$(${{ env.VCPKG_EXE }} fetch nuget) `
+          .$(${{ env.VCPKG_INSTALLATION_ROOT }}/vcpkg fetch nuget) `
             setapikey "${{ secrets.GH_PACKAGES_TOKEN }}" `
             -Source "${{ env.FEED_URL }}"