The branch master has been updated via ae290d8f0cc9fcfec2777bd18c39a4059001c7cc (commit) via 6a7848bc9ee2734c587bf052603a81640effd013 (commit) via 2cda79fb82b59b3977b67cd1d7a644d4486ec462 (commit) via 68b9c2cbf7c89ae58117043e6afc4fed866ac79f (commit) via 0386bf820884ebe192e8343d3e91324da97de29b (commit) from 3bed88a3970605a2ff817065f93b08e965d89e5f (commit)
- Log ----------------------------------------------------------------- commit ae290d8f0cc9fcfec2777bd18c39a4059001c7cc Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Sun Nov 29 19:45:39 2020 +0100 ci.yml: Let 'make' run silently (-s) with build (gcc) runs in parallel (-j4) Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13580) commit 6a7848bc9ee2734c587bf052603a81640effd013 Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Tue Dec 1 09:44:35 2020 +0100 ci.yml: Add 'perl configdata.pm --dump' to each config Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13580) commit 2cda79fb82b59b3977b67cd1d7a644d4486ec462 Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Sat Oct 10 21:36:47 2020 +0200 .travis.yml: Do some build (gcc) runs in parallel (-j4) Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13580) commit 68b9c2cbf7c89ae58117043e6afc4fed866ac79f Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Tue Dec 1 09:14:15 2020 +0100 appveyor.yml: Let 'nmake' do builds in parallel on all CPU cores Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13580) commit 0386bf820884ebe192e8343d3e91324da97de29b Author: Dr. David von Oheimb <david.von.ohe...@siemens.com> Date: Tue Dec 1 08:52:33 2020 +0100 appveyor.yml: Let 'nmake' run by defaut silently (/S), using MAKEVERBOSE like .travis.yml Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/13580) ----------------------------------------------------------------------- Summary of changes: .github/workflows/ci.yml | 51 ++++++++++++++++++++++++++++-------------------- .travis.yml | 5 +++-- appveyor.yml | 20 +++++++++++++------ 3 files changed, 47 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e6518c45da..75969493e0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,17 +2,26 @@ name: GitHub CI on: [pull_request] +# for some reason, this does not work: +# variables: +# BUILDOPTS: "-j4" +# HARNESS_JOBS: "${HARNESS_JOBS:-4}" + +# for some reason, this does not work: +# before_script: +# - make="make -s" + jobs: basic_gcc: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config --strict-warnings + run: ./config --strict-warnings && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} - name: make doc-nits run: make doc-nits @@ -21,63 +30,63 @@ jobs: steps: - uses: actions/checkout@v2 - name: config - run: CC=clang ./config --strict-warnings + run: CC=clang ./config --strict-warnings && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} minimal: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config --strict-warnings no-shared no-dso no-pic no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_NO_SECURE_MEMORY -DOPENSSL_SMALL_FOOTPRINT + run: ./config --strict-warnings no-shared no-dso no-pic no-aria no-async no-autoload-config no-blake2 no-bf no-camellia no-cast no-chacha no-cmac no-cms no-comp no-ct no-des no-dgram no-dh no-dsa no-dtls no-ec2m no-engine no-filenames no-gost no-idea no-mdc2 no-md4 no-multiblock no-nextprotoneg no-ocsp no-ocb no-poly1305 no-psk no-rc2 no-rc4 no-rmd160 no-seed no-siphash no-sm2 no-sm3 no-sm4 no-srp no-srtp no-ssl3 no-ssl3-method no-ts no-ui-console no-whirlpool no-asm -DOPENSSL_NO_SECURE_MEMORY -DOPENSSL_SMALL_FOOTPRINT && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} sanitizers: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config --debug no-asm enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 + run: ./config --debug no-asm enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: OPENSSL_TEST_RAND_ORDER=0 make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 enable_non-default_options: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config --strict-warnings no-ec enable-ssl-trace enable-zlib enable-zlib-dynamic enable-crypto-mdebug enable-crypto-mdebug-backtrace enable-egd + run: ./config --strict-warnings no-ec enable-ssl-trace enable-zlib enable-zlib-dynamic enable-crypto-mdebug enable-crypto-mdebug-backtrace enable-egd && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} legacy_and_no-asm: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 + run: ./config no-asm -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} buildtest: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: config - run: ./config no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE + run: ./config no-asm no-makedepend enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump - name: make - run: make + run: make -s -j4 - name: make test - run: make test + run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} diff --git a/.travis.yml b/.travis.yml index a6d3488028..6b42cc562a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -173,6 +173,7 @@ before_script: fi; fi - ./configdata.pm --dump + - export BUILDOPTS="-j4" - export HARNESS_JOBS=${HARNESS_JOBS:-4} - cd $top @@ -183,9 +184,9 @@ script: make="make"; fi - if [ -n "$GENERATE" ]; then - make2="$make PERL=no-perl"; + make2="$make $BUILDOPTS PERL=no-perl"; else - make2="$make"; + make2="$make $BUILDOPTS"; fi - top=${PWD} - if [ -n "$DESTDIR" ]; then diff --git a/appveyor.yml b/appveyor.yml index 3ac6d12e26..aa99f5062b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ image: - - Visual Studio 2017 + - Visual Studio 2017 platform: - x64 @@ -50,13 +50,20 @@ before_build: Select-String "\[extended tests\]") ) { $env:EXTENDED_TESTS="yes" } + - ps: >- + If ($env:BUILDONLY -or $env:MAKEVERBOSE) { + $env:NMAKE="nmake" + } Else { + $env:NMAKE="nmake /S" + } build_script: - cd _build - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { - cmd /c "nmake build_all_generated 2>&1" - cmd /c "nmake PERL=no-perl 2>&1" + cmd /c "%NMAKE% build_all_generated 2>&1" + # Unfortunately, CL=/MP would not have parallelizing effect + cmd /c "%NMAKE% PERL=no-perl 2>&1" } - cd .. @@ -64,15 +71,16 @@ test_script: - cd _build - ps: >- If ($env:Configuration -Match "shared" -or $env:EXTENDED_TESTS) { + # Unfortunately, HARNESS_JOBS=4 would not have parallelizing effect if ($env:EXTENDED_TESTS) { - cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes 2>&1" + cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes 2>&1" } Else { - cmd /c "nmake test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" + cmd /c "%NMAKE% test HARNESS_VERBOSE_FAILURE=yes TESTS=-test_fuzz 2>&1" } } - ps: >- if ($env:EXTENDED_TESTS) { mkdir ..\_install - cmd /c "nmake install DESTDIR=..\_install 2>&1" + cmd /c "%NMAKE% install DESTDIR=..\_install 2>&1" } - cd ..