]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
ci: enable lms only on master
authorNikola Pajkovsky <nikolap@openssl.org>
Fri, 11 Jul 2025 07:18:12 +0000 (09:18 +0200)
committerNeil Horman <nhorman@openssl.org>
Mon, 14 Jul 2025 11:35:56 +0000 (07:35 -0400)
a new config option cannot be enabled globally because the option
was not backported to the older versions.

Signed-off-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28019)

(cherry picked from commit 4337989667b003bbf7ddc10984129d3cba298e8b)

.github/workflows/coveralls.yml
.github/workflows/provider-compatibility.yml

index 38db01c9c1219a6123eb43a8c917e9fa6dc732c2..3002787b764c69a3ebd2cb1279524a868e30b298 100644 (file)
@@ -62,7 +62,7 @@ jobs:
               "extra_config": "no-afalgeng enable-fips"
             }, {
               "branch": "master",
-              "extra_config": "no-afalgeng enable-fips enable-tfo"
+              "extra_config": "no-afalgeng enable-fips enable-tfo enable-lms"
           }]
           EOF
           )
index 62d7defb9b81744e638c465f21bef3798cc75bd7..4c3c11620568471b5b450cdfe2a3fc37a18436b9 100644 (file)
@@ -111,30 +111,37 @@ jobs:
           #     `dir' directory that will be used to build and test in.
           #     `tgz' is the name of the tarball use to keep the artifacts of
           #         the build.
+          #     `extra_config` adds extra config build option for the branch.
           {
             name: openssl-3.0,
             dir: branch-3.0,
             tgz: branch-3.0.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.2,
             dir: branch-3.2,
             tgz: branch-3.2.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.3,
             dir: branch-3.3,
             tgz: branch-3.3.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.4,
             dir: branch-3.4,
             tgz: branch-3.4.tar.gz,
+            extra_config: "",
           }, {
             name: openssl-3.5,
             dir: branch-3.5,
             tgz: branch-3.5.tar.gz,
+            extra_config: "",
           }, {
             name: master,
             dir: branch-master,
             tgz: branch-master.tar.gz,
+            extra_config: "enable-lms",
           },
         ]
 
@@ -150,7 +157,7 @@ jobs:
 
       - name: config branch
         run: |
-          ./config --banner=Configured enable-shared enable-fips ${{ env.opts }}
+          ./config --banner=Configured enable-shared enable-fips ${{ env.opts }} ${{ matrix.branch.extra_config }}
         working-directory: ${{ matrix.branch.dir }}
       - name: config dump current
         run: ./configdata.pm --dump