32-bit

https://learn.microsoft.com/en-us/windows-server/get-started/kms-client-activation-key

.github/workflows/windows.yml

@@ -27,29 +27,12 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-tdm64:
+  build-tdm:
     runs-on: windows-latest
-    env:
-      OPENSSL_VERSION: "3.1.8"
-      OPENSSL_PREFIX: "${{ github.workspace }}/openssl-install-64"
+    strategy:
+      matrix:
+        arch: [x64, x86]
     steps:
-      - name: Install MSYS2 and dependencies
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          install: >-
-            git
-            make
-            perl
-            nasm
-
-      - name: Cache OpenSSL 64-bit build
-        id: cache-openssl
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.OPENSSL_PREFIX }}
-          key: openssl-${{ env.OPENSSL_VERSION }}-msys2-mingw64
-
       - name: Setup TDM-GCC
         run: |
           Write-Host Downloading TDM-GCC v10.3.0...
@@ -66,30 +49,38 @@ jobs:
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
           [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine)
 
-          
-      - name: Build OpenSSL 64-bit (if not cached)
-        if: steps.cache-openssl.outputs.cache-hit != 'true'
-        shell: msys2 {0}
-        run: |
-          export PATH="/c/TDM-GCC-64/bin:$PATH"
-          export OPENSSL_PREFIX="$(pwd)/openssl-install-64"
-          git clone --branch openssl-${OPENSSL_VERSION} https://github.com/openssl/openssl.git
-          cd openssl
-          ./Configure mingw64 no-shared --prefix="${OPENSSL_PREFIX}"
-          make -j$(nproc)
-          make install_sw
-
       - name: Checkout Source Tree
         uses: actions/checkout@v4
 
-      - name: Configure UMSKT (TDM-GCC 64-bit)
+      - name: Download OpenSSL-TDM release asset
+        shell: pwsh
+        run: |
+          if ('${{ matrix.arch }}' -eq 'x64') {
+            $url = "https://github.com/UMSKT/winactiontest/releases/download/openssl/OpenSSL-TDM-64.zip"
+            $dest = "$env:GITHUB_WORKSPACE/OpenSSL-TDM-64"
+            $libdir = "lib64"
+            $cmake_flags = "-m64"
+            $openssl_root = "$env:GITHUB_WORKSPACE/OpenSSL-TDM-64"
+          } else {
+            $url = "https://github.com/UMSKT/winactiontest/releases/download/openssl/OpenSSL-TDM-32.zip"
+            $dest = "$env:GITHUB_WORKSPACE/OpenSSL-TDM-32"
+            $libdir = "lib32"
+            $cmake_flags = "-m32"
+            $openssl_root = "$env:GITHUB_WORKSPACE/OpenSSL-TDM-32"
+          }
+          Invoke-WebRequest -Uri $url -OutFile "OpenSSL-TDM.zip"
+          Expand-Archive -Path "OpenSSL-TDM.zip" -DestinationPath $env:GITHUB_WORKSPACE
+          echo "OPENSSL_ROOT=$openssl_root" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "OPENSSL_LIBDIR=$libdir" | Out-File -FilePath $env:GITHUB_ENV -Append
+          echo "CMAKE_FLAGS=$cmake_flags" | Out-File -FilePath $env:GITHUB_ENV -Append
+
+      - name: Configure UMSKT (TDM-GCC ${{ matrix.arch }})
         shell: pwsh
         run: |
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
-          $OPENSSL_ROOT = "$env:GITHUB_WORKSPACE/openssl-install-64"
-          $OPENSSL_LIB = "$OPENSSL_ROOT"
+          $OPENSSL_ROOT = "$env:OPENSSL_ROOT"
+          $OPENSSL_LIB = "$OPENSSL_ROOT/$env:OPENSSL_LIBDIR"
           $OPENSSL_INC = "$OPENSSL_ROOT/include"
-
           cmake -G "MinGW Makefiles" `
             -DCMAKE_C_COMPILER="gcc" `
             -DCMAKE_CXX_COMPILER="g++" `
@@ -97,11 +88,11 @@ jobs:
             -DOPENSSL_INCLUDE_DIR="$OPENSSL_INC" `
             -DOPENSSL_CRYPTO_LIBRARY="$OPENSSL_LIB/libcrypto.a" `
             -DOPENSSL_SSL_LIBRARY="$OPENSSL_LIB/libssl.a" `
-            -DCMAKE_C_FLAGS="-m64" `
-            -DCMAKE_CXX_FLAGS="-m64" `
+            -DCMAKE_C_FLAGS="$env:CMAKE_FLAGS" `
+            -DCMAKE_CXX_FLAGS="$env:CMAKE_FLAGS" `
             .
 
-      - name: Build UMSKT (TDM-GCC 64-bit)
+      - name: Build UMSKT (TDM-GCC ${{ matrix.arch }})
         shell: pwsh
         run: |
           $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH
@@ -110,7 +101,5 @@ jobs:
       - name: Upload build artifact
         uses: actions/upload-artifact@v4.6.2
         with:
-          name: UMSKT-TDM64
-          path: ./Release/*
-
-# 32-bit support will happen when everything's all good
+          name: UMSKT-TDM${{ matrix.arch }}
+          path: umskt.exe