Update CI with checks for disabled IDEA, and remove redundant checks.

rnpgp · Sep 22, 2022 · 2262326 · 2262326
1 parent da8d258
commit 2262326
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 26 deletions.
diff --git a/.github/workflows/centos8-ossl.yml b/.github/workflows/centos8-ossl.yml
@@ -53,39 +53,16 @@ jobs:
       matrix:
         env:
           - BUILD_MODE: normal
-            RNP_TESTS: rnp_tests
             CC: gcc
             CXX: g++
-          - BUILD_MODE: sanitize
-            RNP_TESTS: rnp_tests
-            CC: gcc
-            CXX: g++
-          - BUILD_MODE: normal
-            RNP_TESTS: cli_tests
-            CC: gcc
-            CXX: g++
-          - BUILD_MODE: sanitize
-            RNP_TESTS: cli_tests
-            CC: gcc
-            CXX: g++
-          - BUILD_MODE: normal
-            RNP_TESTS: rnp_tests
-            CC: clang
-            CXX: clang++
-          - BUILD_MODE: sanitize
-            RNP_TESTS: rnp_tests
-            CC: clang
-            CXX: clang++
           - BUILD_MODE: normal
-            RNP_TESTS: cli_tests
             CC: clang
             CXX: clang++
           - BUILD_MODE: sanitize
-            RNP_TESTS: cli_tests
             CC: clang
             CXX: clang++
     env: ${{ matrix.env }}
-    name: centos:stream8 OpenSSL [test type ${{ matrix.env.RNP_TESTS }}; mode ${{ matrix.env.BUILD_MODE }}; CC ${{ matrix.env.CC }}; GnuPG ${{ matrix.env.GPG_VERSION }}]
+    name: centos:stream8 OpenSSL [test mode ${{ matrix.env.BUILD_MODE }}; CC ${{ matrix.env.CC }}]
     steps:
       - run: |
           yum -y install git
@@ -107,7 +84,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.CACHE_DIR }}
-          key: ${{ github.workflow }}-${{ runner.os }}-${{ matrix.env.BUILD_MODE }}-${{ matrix.env.CC }}-gpg-${{ matrix.env.GPG_VERSION }}-${{ hashFiles('ci/**') }}-${{ hashFiles('.github/workflows/**') }}
+          key: ${{ github.workflow }}-${{ runner.os }}-${{ matrix.env.BUILD_MODE }}-${{ matrix.env.CC }}-${{ hashFiles('ci/**') }}-${{ hashFiles('.github/workflows/**') }}
       - name: Build cache
         if: steps.cache.outputs.cache-hit != 'true'
         run: |

diff --git a/.github/workflows/centos9-ossl.yml b/.github/workflows/centos9-ossl.yml
@@ -55,14 +55,25 @@ jobs:
           - BUILD_MODE: normal
             CC: gcc
             CXX: g++
+            ENABLE_IDEA: On
+          - BUILD_MODE: normal
+            CC: gcc
+            CXX: g++
+            ENABLE_IDEA: Off
           - BUILD_MODE: normal
             CC: clang
             CXX: clang++
+            ENABLE_IDEA: On
 # Sanitize is only tested with the clang compiler
 # see env-common.inc.sh
           - BUILD_MODE: sanitize
             CC: clang
             CXX: clang++
+            ENABLE_IDEA: On
+          - BUILD_MODE: sanitize
+            CC: clang
+            CXX: clang++
+            ENABLE_IDEA: Off
     env: ${{ matrix.env }}
     name: centos:stream9 OpenSSL [mode ${{ matrix.env.BUILD_MODE }}; CC ${{ matrix.env.CC }};]
     steps:
@@ -99,7 +110,7 @@ jobs:
           /home/rnpuser/local-installs/rnp-install/bin/rnp --version > rnp-version
           # Make sure that we support all features which should be supported
           supported=( RSA ELGAMAL DSA ECDH ECDSA EDDSA \
-            IDEA TRIPLEDES CAST5 BLOWFISH AES128 AES192 AES256 CAMELLIA128 CAMELLIA192 CAMELLIA256 \
+            TRIPLEDES CAST5 BLOWFISH AES128 AES192 AES256 CAMELLIA128 CAMELLIA192 CAMELLIA256 \
             MD5 SHA1 RIPEMD160 SHA256 SHA384 SHA512 SHA224 SHA3-256 SHA3-512 \
             ZIP ZLIB BZip2 \
             "NIST P-256" "NIST P-384" "NIST P-521" Ed25519 Curve25519 secp256k1 )
@@ -108,6 +119,11 @@ jobs:
           bp=( brainpoolP256r1 brainpoolP384r1 brainpoolP512r1 )
           # SM2
           unsupported+=("${sm2[@]}")
+          if [[ "$ENABLE_IDEA" == "On" ]] ;then
+            supported+=(IDEA)
+          else
+            unsupported+=(IDEA)
+          fi
           unsupported+=("${bp[@]}")
           for feature in "${supported[@]}"
           do