Commit b2335251a8 for openssl.org
commit b2335251a885ab5b48302ff59347e7faee2f1672
Author: Tomas Mraz <tomas@openssl.foundation>
Date: Wed Sep 9 16:11:24 2026 +0200
Add 4.1 branch to various CI jobs
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Merge-date: Fri Sep 11 13:05:06 2026
Merged-from: https://github.com/openssl/openssl/pull/32768
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 876753f641..5c07057ce3 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -25,6 +25,9 @@ jobs:
matrix:
release: [
{
+ branch: '4.1',
+ cppflags: ''
+ }, {
branch: '4.0',
cppflags: ''
}, {
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index 34075a3566..42fd0a188c 100644
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -48,6 +48,9 @@ jobs:
[{
"branch": "master",
"extra_config": "enable-fips enable-tfo enable-lms enable-crypto-mdebug enable-unit-tests"
+ }, {
+ "branch": "openssl-4.1",
+ "extra_config": "enable-fips enable-tfo enable-lms enable-crypto-mdebug enable-unit-tests"
}, {
"branch": "openssl-4.0",
"extra_config": "enable-fips enable-tfo enable-lms enable-crypto-mdebug"
diff --git a/.github/workflows/interop-tests.yml b/.github/workflows/interop-tests.yml
index e9cc920d33..6b3969eb4f 100644
--- a/.github/workflows/interop-tests.yml
+++ b/.github/workflows/interop-tests.yml
@@ -113,6 +113,7 @@ jobs:
matrix:
branch: [
{ openssl: 'master', openssh: 'openssl-master', openssl_config: 'no-docs'},
+ { openssl: 'openssl-4.1', openssh: 'openssl-4.1', openssl_config: 'no-docs'},
{ openssl: 'openssl-4.0', openssh: 'openssl-4.0', openssl_config: 'no-docs'},
{ openssl: 'openssl-3.6', openssh: 'openssl-3.6', openssl_config: 'no-docs'},
{ openssl: 'openssl-3.5', openssh: 'openssl-3.5', openssl_config: 'no-docs'},
diff --git a/.github/workflows/prov-compat-label.yml b/.github/workflows/prov-compat-label.yml
index 7d2a4755e6..391b6f2af0 100644
--- a/.github/workflows/prov-compat-label.yml
+++ b/.github/workflows/prov-compat-label.yml
@@ -144,6 +144,11 @@ jobs:
dir: branch-4.0,
tgz: branch-4.0.tar.gz,
extra_config: "enable-lms enable-tls-deprecated-ec",
+ }, {
+ name: openssl-4.1,
+ dir: branch-4.1,
+ tgz: branch-4.1.tar.gz,
+ extra_config: "enable-lms enable-tls-deprecated-ec",
}, {
name: master,
dir: branch-master,
@@ -214,12 +219,14 @@ jobs:
# Note that releases are not used as a test environment for
# later providers. Problems in these situations ought to be
# caught by cross branch testing before the release.
- tree_a: [ branch-4.0, branch-3.6, branch-3.5, branch-3.4, branch-3.0,
+ tree_a: [ branch-4.1, branch-4.0, branch-3.6, branch-3.5, branch-3.4, branch-3.0,
openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
tree_b: [ PR ]
include:
- tree_a: PR
tree_b: branch-master
+ - tree_a: PR
+ tree_b: branch-4.1
- tree_a: PR
tree_b: branch-4.0
- tree_a: PR
diff --git a/.github/workflows/provider-compatibility.yml b/.github/workflows/provider-compatibility.yml
index f07aea6143..1c0132f8e7 100644
--- a/.github/workflows/provider-compatibility.yml
+++ b/.github/workflows/provider-compatibility.yml
@@ -139,6 +139,11 @@ jobs:
dir: branch-4.0,
tgz: branch-4.0.tar.gz,
extra_config: "enable-lms enable-tls-deprecated-ec",
+ }, {
+ name: openssl-4.1,
+ dir: branch-4.1,
+ tgz: branch-4.1.tar.gz,
+ extra_config: "enable-lms enable-tls-deprecated-ec",
}, {
name: master,
dir: branch-master,
@@ -213,10 +218,10 @@ jobs:
# Note that releases are not used as a test environment for
# later providers. Problems in these situations ought to be
# caught by cross branch testing before the release.
- tree_a: [ branch-master, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
+ tree_a: [ branch-master, branch-4.1, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
branch-3.0,
openssl-3.0.0, openssl-3.0.8, openssl-3.0.9, openssl-3.1.2 ]
- tree_b: [ branch-master, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
+ tree_b: [ branch-master, branch-4.1, branch-4.0, branch-3.6, branch-3.5, branch-3.4,
branch-3.0 ]
steps:
- name: early exit checks