Update Visual Studio paths for arm64 architecture in build workflows

Author: Luigi96

.github/workflows/build-windows.yml

@@ -106,7 +106,7 @@ jobs:
         run: |
           set +e
           if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then
-            vcvars="/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvarsarm64.bat"
+            vcvars="/c/Program Files/Microsoft Visual Studio/2022/Enterprise/vc/auxiliary/build/vcvarsarm64.bat"
           else
             vcvars="/c/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/vc/auxiliary/build/vcvars64.bat"
           fi
@@ -122,8 +122,13 @@ jobs:
       - name: 'Install toolchain and dependencies'
         run: |
           # Run Visual Studio Installer
+          if [ "${{ inputs.msvc-toolset-architecture }}" = "arm64" ]; then
+            install_path="C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
+          else
+            install_path="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise"
+          fi
           '/c/Program Files (x86)/Microsoft Visual Studio/Installer/vs_installer.exe' \
-            modify --quiet --installPath 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise' \
+            modify --quiet --installPath "${install_path}" \
             --add Microsoft.VisualStudio.Component.VC.${{ inputs.msvc-toolset-version }}.${{ inputs.msvc-toolset-architecture }}
         if: steps.toolchain-check.outputs.toolchain-installed != 'true'
 

.github/workflows/main.yml

@@ -329,7 +329,6 @@ jobs:
       msvc-toolset-version: '14.29'
       msvc-toolset-architecture: 'arm64'
       make-target: 'hotspot'
-      extra-conf-options: '--openjdk-target=aarch64-unknown-cygwin'
       configure-arguments: ${{ github.event.inputs.configure-arguments }}
       make-arguments: ${{ github.event.inputs.make-arguments }}
     if: needs.prepare.outputs.windows-aarch64 == 'true'