Merge remote-tracking branch 'xiaoqiang/7.0' into PSI-7.0

.github/workflows/ci-scripts-build.yml

@@ -45,8 +45,9 @@ jobs:
       CI_CROSS_TARGETS: ${{ matrix.cross }}
       EXTRA: ${{ matrix.extra }}
       TEST: ${{ matrix.test }}
+      CHOCO: llvm
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         # Job names also name artifacts, character limitations apply
         include:
@@ -170,10 +171,16 @@ jobs:
             configuration: debug
             name: "Win2019 MSC-19, debug"
 
-          - os: windows-2019
+          - os: windows-2022
             cmp: gcc
             configuration: default
-            name: "Win2019 mingw"
+            name: "Win2022 mingw"
+
+          - os: windows-2019
+            cmp: clang+vs2019
+            configuration: default
+            name: "Win2019 clang-cl"
+            choco: ["llvm"]
 
           # Cross builds