Commit bdebaa496c for openssl.org
commit bdebaa496c2e98115c3d881951084cb69b053a47
Author: Milan Broz <gmazyland@gmail.com>
Date: Sun Apr 5 21:24:28 2026 +0200
ci: Use jom to parallize Windows builds
The jom version in choco install is obsolete,
but it works fine for CI.
Users should use jom 1.1.7 or more recent.
Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Mon Apr 13 08:46:21 2026
(Merged from https://github.com/openssl/openssl/pull/30703)
diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml
index c920128efe..66c8c2c2e8 100644
--- a/.github/workflows/os-zoo.yml
+++ b/.github/workflows/os-zoo.yml
@@ -153,6 +153,8 @@ jobs:
run: |
choco install nasm
"C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+ - name: install jom
+ run: choco install jom
- name: prepare the build directory
run: mkdir _build
- name: config
@@ -167,7 +169,7 @@ jobs:
shell: cmd
run: |
call "${{ matrix.platform.vcvars }}"
- nmake /S
+ jom /j4 /S
- name: download coreinfo
run: |
mkdir _build\coreinfo
@@ -183,7 +185,7 @@ jobs:
shell: cmd
run: |
call "${{ matrix.platform.vcvars }}"
- nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4 LHASH_WORKERS=16
+ jom test VERBOSE_FAILURE=yes HARNESS_JOBS=4 LHASH_WORKERS=16
linux-arm64:
runs-on: ubuntu-24.04-arm
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index bd59b86aae..6a64ec55e2 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -41,6 +41,8 @@ jobs:
run: |
choco install nasm ${{ matrix.platform.arch == 'x86' && '--x86' || '' }}
"C:\Program Files${{ matrix.platform.arch == 'x86' && ' (x86)' || '' }}\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+ - name: install jom
+ run: choco install jom
- name: prepare the build directory
run: mkdir _build
- name: config
@@ -55,7 +57,7 @@ jobs:
shell: cmd
run: |
call "${{ matrix.platform.vcvars }}"
- nmake /S
+ jom /j4 /S
- name: download coreinfo
run: |
mkdir _build\coreinfo
@@ -93,7 +95,7 @@ jobs:
shell: cmd
run: |
call "${{ matrix.platform.vcvars }}"
- nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
+ jom test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
- name: install
# Run on 64 bit only as 32 bit is slow enough already
if: ${{ matrix.platform.arch == 'amd64' }}
@@ -102,7 +104,7 @@ jobs:
run: |
call "${{ matrix.platform.vcvars }}"
mkdir _dest
- nmake install DESTDIR=_dest
+ jom /j4 install DESTDIR=_dest
plain:
runs-on: windows-2022
@@ -114,6 +116,8 @@ jobs:
run: git submodule update --init --depth 1 fuzz/corpora
- name: prepare the build directory
run: mkdir _build
+ - name: install jom
+ run: choco install jom
- name: config
working-directory: _build
shell: cmd
@@ -126,7 +130,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake /S
+ jom /j4 /S
- name: download coreinfo
run: |
mkdir _build\coreinfo
@@ -155,6 +159,8 @@ jobs:
run: git submodule update --init --depth 1 fuzz/corpora
- name: prepare the build directory
run: mkdir _build
+ - name: install jom
+ run: choco install jom
- name: config
working-directory: _build
shell: cmd
@@ -167,7 +173,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake
+ jom /j4 /S
- name: download coreinfo
run: |
mkdir _build\coreinfo
@@ -184,7 +190,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
+ jom test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
cygwin:
# Run a job for each of the specified target architectures:
diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml
index 768d0ebf5c..09663c3225 100644
--- a/.github/workflows/windows_comp.yml
+++ b/.github/workflows/windows_comp.yml
@@ -32,6 +32,8 @@ jobs:
run: |
choco install nasm
"C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+ - name: install jom
+ run: choco install jom
- name: prepare the build directory
run: mkdir _build
- name: Get zstd
@@ -50,7 +52,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake
+ jom /j4 /S
- name: Gather openssl version info
working-directory: _build
run: |
@@ -81,7 +83,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake test VERBOSE_FAILURE=yes TESTS="-test_fuzz* -test_fipsload" HARNESS_JOBS=4
+ jom test VERBOSE_FAILURE=yes TESTS="-test_fuzz* -test_fipsload" HARNESS_JOBS=4
brotli:
runs-on: windows-latest
@@ -95,6 +97,8 @@ jobs:
run: |
choco install nasm
"C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
+ - name: install jom
+ run: choco install jom
- name: prepare the build directory
run: mkdir _build
- name: Get brotli
@@ -113,7 +117,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake
+ jom /j4 /S
- name: Gather openssl version info
working-directory: _build
run: |
@@ -144,4 +148,4 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
- nmake test VERBOSE_FAILURE=yes TESTS="-test_fuzz* -test_fipsload" HARNESS_JOBS=4
+ jom test VERBOSE_FAILURE=yes TESTS="-test_fuzz* -test_fipsload" HARNESS_JOBS=4