ci: separate the config dump from the configuration command

This avoids using the shell's `&&` and shortens the lines a bit.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16174)

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index 34e5117298f67d217e2a7db42da9f4c63efc1d15..c43a306ed3f826544cc89a5cb9c27a2b806252b4 100644 (file)
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -14,7 +14,10 @@ jobs:
       run: |
         sudo apt-get -yq install lcov
     - name: config
-      run: CC=gcc ./config --banner=Configured --debug --coverage no-asm enable-fips enable-rc5 enable-md2 enable-ssl3 enable-nextprotoneg enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-shared enable-buildtest-c++ enable-external-tests -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION && perl configdata.pm --dump
+      run: CC=gcc ./config --banner=Configured --debug --coverage no-asm enable-fips enable-rc5 enable-md2 enable-ssl3 enable-nextprotoneg enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-shared enable-buildtest-c++ enable-external-tests -DPEDANTIC -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+    - name: config dump
+      run: ./configdata.pm --dump
+
     - name: make
       run: make -s -j4
     - name: make test

diff --git a/.github/workflows/fips-checksums.yml b/.github/workflows/fips-checksums.yml
index 0b3111c1a732cb2f79f78b200368ba960bf35add..f9f916055d8816d38b7dd33116718a9d9ca3daca 100644 (file)
--- a/.github/workflows/fips-checksums.yml
+++ b/.github/workflows/fips-checksums.yml
@@ -21,9 +21,14 @@ jobs:
           repository: ${{ github.event.pull_request.base.repo.full_name }}
           ref: ${{ github.event.pull_request.base.ref }}
           path: source-pristine
+
       - name: config pristine
-        run: ../source-pristine/config enable-fips && perl configdata.pm --dump
+        run: ../source-pristine/config enable-fips
+        working-directory: ./build-pristine
+      - name: config pristine dump
+        run: ./configdata.pm --dump
         working-directory: ./build-pristine
+
       - name: make build_generated pristine
         run: make -s build_generated
         working-directory: ./build-pristine
@@ -33,9 +38,14 @@ jobs:
       - uses: actions/checkout@v2
         with:
           path: source
+
       - name: config
-        run: ../source/config enable-fips && perl configdata.pm --dump
+        run: ../source/config enable-fips
+        working-directory: ./build
+      - name: config dump
+        run: ./configdata.pm --dump
         working-directory: ./build
+
       - name: make build_generated
         run: make -s build_generated
         working-directory: ./build

diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 39423845f39d694442dc7fc98a807b983c75cc2a..032a1c5d3284cd5615e883224fe6a2953a810618 100644 (file)
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -31,7 +31,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: config
-      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }} && perl configdata.pm --dump
+      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }}
+    - name: config dump
+      run: ./configdata.pm --dump
+
     - name: make
       run: make -s -j4
     - name: make test

diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index 0ab02c537575067056b6e7a60f4676d965d0a6ac..b8fbbddf62fcd4186be8c57d9aeef5216fde2673 100644 (file)
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -125,7 +125,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: config
-      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }} && perl configdata.pm --dump
+      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }}
+    - name: config dump
+      run: ./configdata.pm --dump
+
     - name: make
       run: make -s -j4
     - name: make test

diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml
index 81121e7f3a168f62c14c65592cfee470c4936506..7b61c36028789d77563453b212216b21b1594226 100644 (file)
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -24,7 +24,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: config
-      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }} && perl configdata.pm --dump
+      run: CC=clang ./config --banner=Configured --strict-warnings ${{ matrix.opt }}
+    - name: config dump
+      run: ./configdata.pm --dump
+
     - name: make
       run: make -s -j4
     - name: make test