CI updates

.github/workflows/weekly-ci-bs-cmake-windows-ninja.yml

@@ -28,10 +28,10 @@ jobs:
           # clang-cl
           - { os: windows-2022, cc: clang-cl, cxx: clang-cl, vsversion: 2022, arch: amd64 }
           # gcc (mingw-gcc)
-          - { os: windows-2022, cc: gcc, cxx: 'g++', arch: amd64 }
+          - { os: windows-2022, cc: gcc, cxx: 'g++', arch: amd64, xflags: '-static' }
     env:
-      CC: ${{ matrix.cc }}
-      CXX: ${{ matrix.cxx }}
+      CC: ${{ matrix.cc }} ${{ matrix.xflags }}
+      CXX: ${{ matrix.cxx }} ${{ matrix.xflags }}
     name: ${{ format('{0} {1} {2}', matrix.cc, matrix.vsversion, matrix.arch) }}
     runs-on: ${{ matrix.os }}
     steps:
@@ -44,20 +44,24 @@ jobs:
         with:
           vsversion: ${{ matrix.vsversion }}
           arch: ${{ matrix.arch }}
+      - name: 'Init environment'
+        shell: bash
+        run: |
+          command -v ninja >/dev/null || choco install -y --no-progress ninja
+          xtarget="windows-make-${{ matrix.cc }}-${{ matrix.vsversion }}-${{ matrix.arch}}"
+          echo "xtarget=$xtarget" >> $GITHUB_ENV
       - name: 'Build cmake Ninja Debug'
         shell: bash
         run: |
-          xtarget="windows-ninja-${{ matrix.cc }}-${{ matrix.vsversion }}-${{ matrix.arch}}"
-          echo "xtarget=$xtarget" >> $GITHUB_ENV
           make UPX_XTARGET=$xtarget xtarget/debug
-          ls -l build/xtarget/$xtarget/*/upx.exe
-          file build/xtarget/$xtarget/*/upx.exe || true
+          ls -l build/xtarget/$xtarget/debug/upx.exe
+          file  build/xtarget/$xtarget/debug/upx.exe || true
       - name: 'Build cmake Ninja Release'
         shell: bash
         run: |
           make UPX_XTARGET=$xtarget xtarget/release
-          ls -l build/xtarget/$xtarget/*/upx.exe
-          file build/xtarget/$xtarget/*/upx.exe || true
+          ls -l build/xtarget/$xtarget/release/upx.exe
+          file  build/xtarget/$xtarget/release/upx.exe || true
       - name: 'Make artifact'
         shell: bash
         run: |