ci: Remove no longer supported config options

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fc8a9f3f88943d39ae044a948d78650e3cb10823..d4712c262ede09f7c89225810734ed9d8fcf3610 100644 (file)
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -588,7 +588,7 @@ jobs:
     - name: checkout fuzz/corpora submodule
       run: git submodule update --init --depth 1 fuzz/corpora
     - name: config
-      run: ./config --strict-warnings --banner=Configured --debug no-afalgeng enable-demos enable-h3demo no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-fips && perl configdata.pm --dump
+      run: ./config --strict-warnings --banner=Configured --debug enable-demos enable-h3demo no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
     - name: get cpu info
@@ -711,7 +711,7 @@ jobs:
     - name: setup hostname workaround
       run: sudo hostname localhost
     - name: config
-      run: ./config --strict-warnings --banner=Configured --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests no-fips && perl configdata.pm --dump
+      run: ./config --strict-warnings --banner=Configured --debug enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
     - uses: dtolnay/rust-toolchain@0f44b27771c32bda9f458f75a1e241b09791b331

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index 5c05e8e2e57f2543d5b210c857e82d02ca774804..c219577991ebf55516f5bdfb2751338bd857317c 100644 (file)
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -68,7 +68,7 @@ jobs:
               "extra_config": "no-afalgeng enable-fips"
             }, {
               "branch": "master",
-              "extra_config": "no-afalgeng enable-fips enable-tfo enable-lms enable-crypto-mdebug enable-allocfail-tests"
+              "extra_config": "enable-fips enable-tfo enable-lms enable-crypto-mdebug enable-allocfail-tests"
           }]
           EOF
           )

diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index d517dacf2fef85f34993c28ae07e1753ca41e30d..9d347b16bfe9f85dd1435640cf47571267743183 100644 (file)
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -24,7 +24,6 @@ jobs:
       matrix:
         opt: [
           386,
-          no-afalgeng,
           no-apps,
           no-argon2,
           no-aria,
@@ -41,7 +40,6 @@ jobs:
           no-bulk,
           no-cached-fetch,
           no-camellia,
-          no-capieng,
           no-cast,
           no-chacha,
           no-cmac,
@@ -52,7 +50,6 @@ jobs:
           enable-demos,
           no-deprecated,
           no-des,
-#          enable-devcryptoeng,  # Cannot work on Linux
           no-docs,
           no-dsa,
           no-dtls1,
@@ -63,7 +60,6 @@ jobs:
           no-ecdsa,
           enable-ec_nistp_64_gcc_128,
           enable-egd,
-          no-engine,
 #          enable-external-tests,  # Requires extra setup
           enable-fips,
           enable-fips enable-acvp-tests,
@@ -76,7 +72,6 @@ jobs:
           enable-heartbeats,
           enable-hqinterop,
           no-hw,
-          no-hw-padlock,
           no-idea,
           enable-lms,
           no-makedepend,
@@ -87,7 +82,6 @@ jobs:
           no-multiblock,
           no-nextprotoneg,
           no-ocb,
-          no-padlockeng,
           no-pic,
           no-poly1305,
           no-posix-io,
@@ -114,7 +108,7 @@ jobs:
           enable-ssl3,
           enable-ssl3-method,
           enable-sslkeylog,
-          no-static-engine no-shared,
+          no-shared,
           no-tests,
           enable-tfo,
           no-tls1,

diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index fd553f54917d6758421cc811bc4cca2c80e7b853..1a3a12c3e382714794e32ffcd3d8453bb1172368 100644 (file)
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -20,9 +20,8 @@ jobs:
         opt: [
           enable-asan enable-ubsan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=function,
           no-dso,
-          no-dynamic-engine,
           no-ec2m enable-fips,
-          no-engine no-shared,
+          no-shared,
           no-err,
           no-filenames,
           enable-ubsan no-asm -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=function,