[CI] Update windows sdk to 22621

Signed-off-by: Shen-Ta Hsieh <[email protected]>
WasmEdge · Jun 12, 2024 · 9f4e516 · 9f4e516
1 parent 563fd69
commit 9f4e516
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,20 +26,26 @@ jobs:
       uses: crazy-max/ghaction-chocolatey@v1
       with:
         args: install cmake ninja vswhere
+    - name: Upgrade dependency
+      uses: crazy-max/ghaction-chocolatey@v1
+      with:
+        args: upgrade llvm
 
-    - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1
+    - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
       with:
-        sdk-version: 19041
+        sdk-version: 22621
+
+    - name: Checkout by pushing tags
+      run: git clone --branch llvmorg-17.0.6 --depth 1 https://github.com/llvm/llvm-project.git
 
     - name: Build llvm
       run: |
         $vsPath = (vswhere -latest -property installationPath)
         Import-Module (Join-Path $vsPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
-        Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.19041.0"
+        Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.22621.0"
         $Env:CC = "clang-cl"
         $Env:CXX = "clang-cl"
-        $cmake_sys_ver = "10.0.19041.0"
-        git clone --branch llvmorg-17.0.6 --depth 1 https://github.com/llvm/llvm-project.git
+        $cmake_sys_ver = "10.0.22621.0"
         cmake -Bbuild -GNinja "-DCMAKE_SYSTEM_VERSION=$cmake_sys_ver" -DCMAKE_MSVC_RUNTIME_LIBRARY=${{ matrix.rtlib }} -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=ZIP "-DCMAKE_INSTALL_PREFIX=$pwd\\prefix" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS="lld;clang;clang-tools-extra" -DLLVM_ENABLE_DIA_SDK=OFF llvm-project\\llvm
         cmake --build build
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
   upload_assets:
     name: Build llvm on Windows
     needs: create_release
-    runs-on: windows-latest
+    runs-on: windows-2022
     strategy:
       matrix:
         rtlib: ["MultiThreadedDLL"]
@@ -39,10 +39,14 @@ jobs:
       uses: crazy-max/ghaction-chocolatey@v1
       with:
         args: install cmake ninja vswhere
+    - name: Upgrade dependency
+      uses: crazy-max/ghaction-chocolatey@v1
+      with:
+        args: upgrade llvm
 
-    - uses: GuillaumeFalourd/setup-windows10-sdk-action@v1
+    - uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
       with:
-        sdk-version: 19041
+        sdk-version: 22621
 
     - name: Checkout by pushing tags
       if: ${{ github.event_name == 'push' }}
@@ -52,10 +56,10 @@ jobs:
       run: |
         $vsPath = (vswhere -latest -property installationPath)
         Import-Module (Join-Path $vsPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
-        Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.19041.0"
+        Enter-VsDevShell -VsInstallPath $vsPath -SkipAutomaticLocation -DevCmdArguments "-arch=x64 -host_arch=x64 -winsdk=10.0.22621.0"
         $Env:CC = "clang-cl"
         $Env:CXX = "clang-cl"
-        $cmake_sys_ver = "10.0.19041.0"
+        $cmake_sys_ver = "10.0.22621.0"
         cmake -Bbuild -GNinja "-DCMAKE_SYSTEM_VERSION=$cmake_sys_ver" -DCMAKE_MSVC_RUNTIME_LIBRARY=${{ matrix.rtlib }} -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=ZIP "-DCMAKE_INSTALL_PREFIX=$pwd\\prefix" -DLLVM_TARGETS_TO_BUILD="X86" -DLLVM_ENABLE_PROJECTS="lld;clang;clang-tools-extra" -DLLVM_ENABLE_DIA_SDK=OFF llvm-project\\llvm
         cmake --build build