From ca3d28b624af110e9e2b2ba89772e92e03646dab Mon Sep 17 00:00:00 2001
From: Derick Payne <rizonetech@gmail.com>
Date: Mon, 19 Jan 2026 02:45:39 +0200
Subject: [PATCH] Fix vcpkg path issues for ARM64 CI build

- Add vcpkgDirectory to avoid path conflicts with repo
- Use explicit paths for vcpkg install with --x-install-root
- Fix VCPKG_ROOT passed to MSBuild
---
 .github/workflows/build.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c880886f0..88ecea849 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,13 +37,16 @@ jobs:
         uses: lukka/run-vcpkg@v11
         with:
           vcpkgGitCommitId: '66c0373dc7fca549e5803087b9487edfe3aca0a1'
+          vcpkgDirectory: '${{ github.workspace }}/vcpkg_installed'
+          doNotCacheOnWorkflowFailure: true
 
       - name: Install Boost ARM64 via vcpkg
         if: matrix.platform == 'ARM64'
         shell: pwsh
         run: |
-          vcpkg install boost-regex:arm64-windows boost-iostreams:arm64-windows --triplet arm64-windows
-          vcpkg integrate install
+          $env:VCPKG_ROOT = "${{ github.workspace }}/vcpkg_installed"
+          & "$env:VCPKG_ROOT/vcpkg.exe" install boost-regex:arm64-windows boost-iostreams:arm64-windows --x-install-root="${{ github.workspace }}/vcpkg_installed/installed"
+          & "$env:VCPKG_ROOT/vcpkg.exe" integrate install
 
       - name: Generate version
         shell: pwsh
@@ -111,7 +114,8 @@ jobs:
           
           # For ARM64, pass VCPKG_ROOT to MSBuild
           if ("${{ matrix.platform }}" -eq "ARM64") {
-            msbuild Notepad3.sln /m /p:Configuration=$config /p:Platform=$platform /p:VCPKG_ROOT="$env:VCPKG_ROOT" /v:minimal
+            $vcpkgRoot = "${{ github.workspace }}/vcpkg_installed"
+            msbuild Notepad3.sln /m /p:Configuration=$config /p:Platform=$platform /p:VCPKG_ROOT="$vcpkgRoot" /v:minimal
           } else {
             msbuild Notepad3.sln /m /p:Configuration=$config /p:Platform=$platform /v:minimal
           }