Skip to content

CI update #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
quarckster wants to merge 5 commits into from
Closed

CI update #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f0d5a78
test.yml: use snapshot.debian.org in the Debian 11 container
quarckster Sep 10, 2026
1f49d12
test.yml: drop EOL OpenSSL branches from the matrix, add 4.0 and 4.1
quarckster Sep 10, 2026
96d0c19
test.yml: update actions/checkout to v7
quarckster Sep 10, 2026
a707b60
test.yml: install NASM on Windows the same way openssl/openssl does
quarckster Sep 10, 2026
8105890
test.yml: build OpenSSL on Windows with jom instead of nmake
quarckster Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/ci-deps.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"jom-1.1.7.exe": "8435dbf96eb9ee65395d46d04dc3af2ff6b2618aefbc7964eeede9be669e8bd6",
"nasm-3.01-installer-x64.exe": "7881e9febc8b6558581041019b7890f109bef0694d93ed82c9589794c7b5a600",
"nasm-3.01-installer-x86.exe": "2e3041dd2abe36cb7e9938057c3cf090dd2eac42d3280957359f87c4d83b9ed0"
}
195 changes: 106 additions & 89 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,27 @@ jobs:
matrix:
release: [
{
openssl-branch: "openssl-3.0",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
configopts: 'no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.2",
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.3",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
openssl-branch: "openssl-3.5",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
openssl-branch: "openssl-3.6",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.5",
openssl-branch: "openssl-4.0",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.6",
openssl-branch: "openssl-4.1",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
Expand All @@ -52,10 +47,12 @@ jobs:
steps:
- name: "Install prerequisites"
run: |
apt-get update
sed -i -e 's|^deb |#deb |' \
-e 's|^# deb http://snapshot|deb http://snapshot|' /etc/apt/sources.list && \
apt-get -o Acquire::Check-Valid-Until=false -o Acquire::Retries=3 update && \
apt-get install -y cmake gcc g++ make perl
- name: "Checkout openssl"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
repository: "openssl/openssl"
ref: ${{ matrix.release.openssl-branch }}
Expand All @@ -74,7 +71,7 @@ jobs:
run: |
make install_sw
- name: "Checkout perftools"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
path: "perftools"
- name: "Config perftools build with -DDEBUG"
Expand Down Expand Up @@ -110,21 +107,6 @@ jobs:
matrix:
release: [
{
openssl-branch: "openssl-3.0",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.0',
configopts: 'no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.2",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.2',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.3",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.3',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.4',
configopts: 'no-apps no-tests',
Expand All @@ -140,10 +122,20 @@ jobs:
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
}, {
openssl-branch: "master",
openssl-branch: "openssl-4.0",
cmakeopts: '-D OPENSSL_VERSION=4.0',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-4.1",
cmakeopts: '-D OPENSSL_VERSION=4.1',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
}, {
openssl-branch: "master",
cmakeopts: '-D OPENSSL_VERSION=4.2',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
}
]
runs-on: "ubuntu-latest"
Expand All @@ -156,7 +148,7 @@ jobs:
apt-get update
apt-get install -y cmake gcc g++ make perl
- name: "Checkout openssl"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
repository: "openssl/openssl"
ref: ${{ matrix.release.openssl-branch }}
Expand All @@ -175,7 +167,7 @@ jobs:
run: |
make install_sw
- name: "Checkout perftools"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
path: "perftools"
- name: "Config perftools build with -DDEBUG"
Expand Down Expand Up @@ -211,32 +203,27 @@ jobs:
matrix:
release: [
{
openssl-branch: "openssl-3.0",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.2",
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.3",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
openssl-branch: "openssl-3.5",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
openssl-branch: "openssl-3.6",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.5",
openssl-branch: "openssl-4.0",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.6",
openssl-branch: "openssl-4.1",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
Expand All @@ -258,7 +245,7 @@ jobs:
run: |
sudo pkg install -y cmake gcc perl5
- name: "Checkout openssl"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
repository: "openssl/openssl"
ref: ${{ matrix.release.openssl-branch }}
Expand Down Expand Up @@ -292,7 +279,7 @@ jobs:
cd openssl
make install_sw
- name: "Checkout perftools"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
path: "perftools"
- name: "Config perftools build with -DDEBUG"
Expand Down Expand Up @@ -358,55 +345,94 @@ jobs:
matrix:
release: [
{
openssl-branch: "openssl-3.0",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
configopts: 'no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.2",
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
z7-patch: "0001-Windows-Use-Z7-compiler-flag-to-enable-parallel-buil.patch",
}, {
openssl-branch: "openssl-3.3",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
openssl-branch: "openssl-3.5",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
z7-patch: "0001-Windows-Use-Z7-compiler-flag-to-enable-parallel-buil.patch",
}, {
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
openssl-branch: "openssl-3.6",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
z7-patch: "0001-Windows-Use-Z7-compiler-flag-to-enable-parallel-buil.patch",
}, {
openssl-branch: "openssl-3.5",
openssl-branch: "openssl-4.0",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
z7-patch: "0001-Windows-Use-Z7-compiler-flag-to-enable-parallel-buil.patch",
}, {
openssl-branch: "openssl-3.6",
openssl-branch: "openssl-4.1",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
z7-patch: '',
}, {
openssl-branch: "master",
cmakeopts: '',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
z7-patch: '',
}
]
runs-on: "windows-latest"
steps:
- name: "Install prerequisites"
- name: "Checkout perftools"
uses: "actions/checkout@v7"
with:
path: "perftools"
- name: "Install nasm"
if: github.repository == 'openssl/perftools'
run: |
$installer = "nasm-3.01-installer-x64.exe"
Invoke-WebRequest -Uri "https://openssl-library.org/ci-deps/$installer" -OutFile $installer
$expected = (Get-Content "$env:GITHUB_WORKSPACE\perftools\.github\ci-deps.json" -Raw | ConvertFrom-Json).$installer
$actual = (Get-FileHash $installer -Algorithm SHA256).Hash
if ($actual -ne $expected) { throw "SHA256 mismatch for $installer (expected $expected, got $actual)" }
Start-Process -FilePath ".\$installer" -ArgumentList '/S' -Wait
"C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
- name: "Install nasm (forks)"
if: github.repository != 'openssl/perftools'
run: |
choco install nasm
$installer = "nasm-3.01-installer-x64.exe"
Invoke-WebRequest -Uri "https://www.nasm.us/pub/nasm/releasebuilds/3.01/win64/$installer" -OutFile $installer
Start-Process -FilePath ".\$installer" -ArgumentList '/S' -Wait
"C:\Program Files\NASM" | Out-File -FilePath "$env:GITHUB_PATH" -Append
- name: "Install jom"
if: github.repository == 'openssl/perftools'
run: |
mkdir C:\jom
Invoke-WebRequest -Uri "https://openssl-library.org/ci-deps/jom-1.1.7.exe" -OutFile C:\jom\jom.exe
$expected = (Get-Content "$env:GITHUB_WORKSPACE\perftools\.github\ci-deps.json" -Raw | ConvertFrom-Json).'jom-1.1.7.exe'
$actual = (Get-FileHash C:\jom\jom.exe -Algorithm SHA256).Hash
if ($actual -ne $expected) { throw "SHA256 mismatch for jom.exe (expected $expected, got $actual)" }
"C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append
- name: "Install jom (forks)"
if: github.repository != 'openssl/perftools'
run: |
mkdir C:\jom
Invoke-WebRequest -Uri "https://download.qt.io/official_releases/jom/jom_1_1_7.zip" -OutFile C:\jom\jom.zip
Expand-Archive -Path C:\jom\jom.zip -DestinationPath C:\jom
"C:\jom" | Out-File -FilePath "$env:GITHUB_PATH" -Append
- name: "Checkout openssl"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
repository: "openssl/openssl"
ref: ${{ matrix.release.openssl-branch }}
fetch-depth: 1
path: "openssl"
- name: "Apply the /Z7 parallel-build patch to openssl"
if: ${{ matrix.release.z7-patch != '' }}
working-directory: ".\\openssl"
run: |
git apply -C1 --verbose "$env:GITHUB_WORKSPACE\perftools\patches\${{ matrix.release.z7-patch }}"
- name: "Config openssl build"
working-directory: ".\\openssl"
shell: cmd
Expand All @@ -418,11 +444,7 @@ jobs:
shell: cmd
run: |
call "C:\Program Files\Microsoft Visual Studio\18\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
nmake
- name: "Checkout perftools"
uses: "actions/checkout@v5"
with:
path: "perftools"
jom /j4 /S
- name: "Config perftools build with -DDEBUG"
if: ${{ matrix.release.has-ssl_poll_perf }}
working-directory: ".\\perftools\\source"
Expand Down Expand Up @@ -456,32 +478,27 @@ jobs:
matrix:
release: [
{
openssl-branch: "openssl-3.0",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.2",
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.3",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
openssl-branch: "openssl-3.5",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
}, {
openssl-branch: "openssl-3.4",
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
openssl-branch: "openssl-3.6",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.5",
openssl-branch: "openssl-4.0",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: false,
has-ssl_poll_perf: true,
}, {
openssl-branch: "openssl-3.6",
openssl-branch: "openssl-4.1",
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
configopts: 'no-apps no-tests',
has-ssl_poll_perf: true,
Expand All @@ -495,7 +512,7 @@ jobs:
runs-on: "macos-latest"
steps:
- name: "Checkout openssl"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
repository: "openssl/openssl"
ref: ${{ matrix.release.openssl-branch }}
Expand All @@ -514,7 +531,7 @@ jobs:
run: |
make install_sw
- name: "Checkout perftools"
uses: "actions/checkout@v5"
uses: "actions/checkout@v7"
with:
path: "perftools"
- name: "Config perftools build with -DDEBUG"
Expand Down
Loading
Loading