[openssl] master update

Dr. Paul Dale pauli at openssl.org
Thu Aug 5 05:42:18 UTC 2021


The branch master has been updated
       via  7587b5fd09d8a2a42acc90e5eecdeb6f160699ff (commit)
       via  ebe667b4645ef8ee742c5364a3ee3dd363bd17b4 (commit)
       via  7b917179d027c9901ea0e8c213f581c8db5d1b9b (commit)
      from  6da0f274834d60c2ad84109e00430f9e4f7ffb85 (commit)


- Log -----------------------------------------------------------------
commit 7587b5fd09d8a2a42acc90e5eecdeb6f160699ff
Author: Pauli <pauli at openssl.org>
Date:   Wed Aug 4 11:06:44 2021 +1000

    CI: remove spurious blank lines
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16174)

commit ebe667b4645ef8ee742c5364a3ee3dd363bd17b4
Author: Pauli <pauli at openssl.org>
Date:   Thu Jul 29 15:24:20 2021 +1000

    ci: specific gcc explicitly on the basic-gcc CI build
    
    GitHub Actions default to clang not gcc so this is necessary now.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16174)

commit 7b917179d027c9901ea0e8c213f581c8db5d1b9b
Author: Pauli <pauli at openssl.org>
Date:   Thu Jul 29 13:37:30 2021 +1000

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16174)

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/ci.yml                |  2 +-
 .github/workflows/coveralls.yml         |  4 +++-
 .github/workflows/fips-checksums.yml    | 10 ++++++++--
 .github/workflows/run-checker-ci.yml    |  4 +++-
 .github/workflows/run-checker-daily.yml |  4 +++-
 .github/workflows/run-checker-merge.yml |  4 +++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9e89d455a9..bcb5cd5775 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -61,7 +61,7 @@ jobs:
     steps:
     - uses: actions/checkout at v2
     - name: config
-      run: ./config --banner=Configured enable-fips --strict-warnings && perl configdata.pm --dump
+      run: CC=gcc ./config --banner=Configured enable-fips --strict-warnings && perl configdata.pm --dump
     - name: make
       run: make -s -j4
     - name: make test
diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
index 34e5117298..45e9e8e62e 100644
--- a/.github/workflows/coveralls.yml
+++ b/.github/workflows/coveralls.yml
@@ -14,7 +14,9 @@ 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..d8aea44786 100644
--- a/.github/workflows/fips-checksums.yml
+++ b/.github/workflows/fips-checksums.yml
@@ -22,7 +22,10 @@ jobs:
           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
@@ -34,7 +37,10 @@ jobs:
         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
diff --git a/.github/workflows/run-checker-ci.yml b/.github/workflows/run-checker-ci.yml
index 39423845f3..3c09194d0c 100644
--- a/.github/workflows/run-checker-ci.yml
+++ b/.github/workflows/run-checker-ci.yml
@@ -31,7 +31,9 @@ jobs:
     steps:
     - uses: actions/checkout at 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..d9374f1cfc 100644
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -125,7 +125,9 @@ jobs:
     steps:
     - uses: actions/checkout at 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..4f5efeae51 100644
--- a/.github/workflows/run-checker-merge.yml
+++ b/.github/workflows/run-checker-merge.yml
@@ -24,7 +24,9 @@ jobs:
     steps:
     - uses: actions/checkout at 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


More information about the openssl-commits mailing list