From: Dmitry Misharov Date: Fri, 24 Apr 2026 07:47:57 +0000 (+0200) Subject: ci: Download jom and NASM from OpenSSL-hosted mirror X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=628b1de776b597464dc8bfc760c019c16541aa92;p=thirdparty%2Fopenssl.git ci: Download jom and NASM from OpenSSL-hosted mirror Chocolatey-hosted packages for jom and NASM occasionally become unavailable, causing CI failures on Windows builds. Host these tools on our own infrastructure to eliminate this external dependency. Affected workflows: windows.yml, windows_comp.yml, os-zoo.yml Reviewed-by: Neil Horman Reviewed-by: Norbert Pocs Reviewed-by: Milan Broz MergeDate: Thu Jun 11 16:17:01 2026 (Merged from https://github.com/openssl/openssl/pull/30957) --- diff --git a/.github/workflows/os-zoo.yml b/.github/workflows/os-zoo.yml index 66c8c2c2e85..806d5568a54 100644 --- a/.github/workflows/os-zoo.yml +++ b/.github/workflows/os-zoo.yml @@ -151,10 +151,14 @@ jobs: run: git submodule update --init --depth 1 fuzz/corpora - name: install nasm run: | - choco install nasm + Invoke-WebRequest -Uri "https://openssl-library.org/nasm-3.01-installer-x64.exe" -OutFile nasm-installer.exe + Start-Process -FilePath .\nasm-installer.exe -ArgumentList '/S' -Wait "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: prepare the build directory run: mkdir _build - name: config diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index ce86f8021cc..68f9bfdd6b0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,10 +39,14 @@ jobs: run: git submodule update --init --depth 1 fuzz/corpora - name: install nasm run: | - choco install nasm ${{ matrix.platform.arch == 'x86' && '--x86' || '' }} + Invoke-WebRequest -Uri "https://openssl-library.org/nasm-3.01-installer-${{ matrix.platform.arch == 'x86' && 'x86' || 'x64' }}.exe" -OutFile nasm-installer.exe + Start-Process -FilePath .\nasm-installer.exe -ArgumentList '/S' -Wait "C:\Program Files${{ matrix.platform.arch == 'x86' && ' (x86)' || '' }}\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: prepare the build directory run: mkdir _build - name: config @@ -117,7 +121,10 @@ jobs: - name: prepare the build directory run: mkdir _build - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: config working-directory: _build shell: cmd @@ -160,7 +167,10 @@ jobs: - name: prepare the build directory run: mkdir _build - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: config working-directory: _build shell: cmd diff --git a/.github/workflows/windows_comp.yml b/.github/workflows/windows_comp.yml index 09663c3225c..df852b30e59 100644 --- a/.github/workflows/windows_comp.yml +++ b/.github/workflows/windows_comp.yml @@ -30,10 +30,14 @@ jobs: run: git submodule update --init --depth 1 fuzz/corpora - name: install nasm run: | - choco install nasm + Invoke-WebRequest -Uri "https://openssl-library.org/nasm-3.01-installer-x64.exe" -OutFile nasm-installer.exe + Start-Process -FilePath .\nasm-installer.exe -ArgumentList '/S' -Wait "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: prepare the build directory run: mkdir _build - name: Get zstd @@ -95,10 +99,14 @@ jobs: run: git submodule update --init --depth 1 fuzz/corpora - name: install nasm run: | - choco install nasm + Invoke-WebRequest -Uri "https://openssl-library.org/nasm-3.01-installer-x64.exe" -OutFile nasm-installer.exe + Start-Process -FilePath .\nasm-installer.exe -ArgumentList '/S' -Wait "C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: install jom - run: choco install jom + run: | + mkdir C:\jom + Invoke-WebRequest -Uri "https://openssl-library.org/jom-1.1.7.exe" -OutFile C:\jom\jom.exe + "C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append - name: prepare the build directory run: mkdir _build - name: Get brotli