diff options
author | Pauli <pauli@openssl.org> | 2021-07-29 13:37:30 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-08-05 15:41:29 +1000 |
commit | 7b917179d027c9901ea0e8c213f581c8db5d1b9b (patch) | |
tree | b572bfdcd1a4a4f9286080ecfc91eb056256f804 /.github | |
parent | 6da0f274834d60c2ad84109e00430f9e4f7ffb85 (diff) | |
download | openssl-new-7b917179d027c9901ea0e8c213f581c8db5d1b9b.tar.gz |
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)
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/coveralls.yml | 5 | ||||
-rw-r--r-- | .github/workflows/fips-checksums.yml | 14 | ||||
-rw-r--r-- | .github/workflows/run-checker-ci.yml | 5 | ||||
-rw-r--r-- | .github/workflows/run-checker-daily.yml | 5 | ||||
-rw-r--r-- | .github/workflows/run-checker-merge.yml | 5 |
5 files changed, 28 insertions, 6 deletions
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml index 34e5117298..c43a306ed3 100644 --- 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 0b3111c1a7..f9f916055d 100644 --- 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 39423845f3..032a1c5d32 100644 --- 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 0ab02c5375..b8fbbddf62 100644 --- 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 81121e7f3a..7b61c36028 100644 --- 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 |