From acc1010d7a875f4d057239dee855231ec0acbab8 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 20 Jun 2024 23:58:27 -0400
Subject: [PATCH] Try jom on windows

---
 .github/workflows/build.yaml | 10 ++--------
 build-cmd.sh                 | 16 ++++++++--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 49ce7a1d..259b7a86 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -12,14 +12,8 @@ jobs:
         if: ${{ runner.os == 'Windows' }}
         shell: pwsh
         run: |
-          choco install nasm
-          echo "C:\Program Files\NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      - uses: shogo82148/actions-setup-perl@v1
-        if: ${{ runner.os == 'Windows' }}
-        with:
-          perl-version: "5.38"
-          distribution: strawberry
-      - uses: AlchemyViewer/action-autobuild@v4
+          choco install -y nasm jom
+          echo "C:\Program Files\NASM;C:\ProgramData\chocolatey\lib\jom\tools" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         with:
           addrsize: ${{ matrix.addrsize }}
           build-variables-repo: alchemyviewer/build-variables
diff --git a/build-cmd.sh b/build-cmd.sh
index e991afa0..dc8c1e58 100755
--- a/build-cmd.sh
+++ b/build-cmd.sh
@@ -77,12 +77,12 @@ pushd "$OPENSSL_SOURCE_DIR"
                 --with-zlib-include="$(cygpath -w "$stage/packages/include/zlib")" \
                 --with-zlib-lib="$(cygpath -w "$stage/packages/lib/debug/zlibd.lib")"
 
-            nmake
+            jom
 
             # conditionally run unit tests
-            if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
-                nmake test
-            fi
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     nmake test
+            # fi
 
             cp -a {libcrypto,libssl}.lib "$stage/lib/debug"
 
@@ -95,12 +95,12 @@ pushd "$OPENSSL_SOURCE_DIR"
                 --with-zlib-include="$(cygpath -w "$stage/packages/include/zlib")" \
                 --with-zlib-lib="$(cygpath -w "$stage/packages/lib/release/zlib.lib")"
 
-            nmake
+            jom
 
             # conditionally run unit tests
-            if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
-                nmake test
-            fi
+            # if [ "${DISABLE_UNIT_TESTS:-0}" = "0" ]; then
+            #     nmake test
+            # fi
 
             cp -a {libcrypto,libssl}.lib "$stage/lib/release"