]> 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:20:23 +0000 (07:20 -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)

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

index 9dc41080abbaf1ac4d2db4881bfb2f416497cc30..17e610573ced11c6e5cca460e95b8d7d8285eddd 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
           )
@@ -99,7 +99,7 @@ jobs:
     - name: setup hostname workaround
       run: sudo hostname localhost
     - name: config
-      run: CC=gcc ./config --debug --coverage ${{ matrix.branches.extra_config }} no-asm enable-lms enable-rc5 enable-md2 enable-ssl3 enable-nextprotoneg enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-buildtest-c++ enable-ssl-trace enable-trace
+      run: CC=gcc ./config --debug --coverage ${{ matrix.branches.extra_config }} no-asm enable-rc5 enable-md2 enable-ssl3 enable-nextprotoneg enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-buildtest-c++ enable-ssl-trace enable-trace
     - name: config dump
       run: ./configdata.pm --dump
     - name: make
index b035ac4233f57bafa41f6cf4cdf10bf6510a4e4a..4bd62174799cdde3e84a5c5d01d9b83a36d215b7 100644 (file)
@@ -24,7 +24,7 @@ permissions:
   contents: read
 
 env:
-  opts: enable-lms enable-rc5 enable-md2 enable-ssl3 enable-weak-ssl-ciphers enable-zlib
+  opts: enable-rc5 enable-md2 enable-ssl3 enable-weak-ssl-ciphers enable-zlib
 
 jobs:
   fips-releases:
@@ -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