]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
GH action workflows: Add cpu report before 'make test'
authorDmitry Misharov <dmitry@openssl.org>
Thu, 28 Sep 2023 08:50:55 +0000 (11:50 +0300)
committerTomas Mraz <tomas@openssl.org>
Tue, 3 Oct 2023 13:53:25 +0000 (15:53 +0200)
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22232)

13 files changed:
.github/workflows/ci.yml
.github/workflows/compiler-zoo.yml
.github/workflows/coveralls.yml
.github/workflows/cross-compiles.yml
.github/workflows/fuzz-checker.yml
.github/workflows/os-zoo.yml
.github/workflows/provider-compatibility.yml
.github/workflows/run-checker-ci.yml
.github/workflows/run-checker-daily-sctp.yml
.github/workflows/run-checker-daily.yml
.github/workflows/run-checker-merge.yml
.github/workflows/windows.yml
.github/workflows/windows_comp.yml

index 1eeaa69ba2c6a20049d5b4d74c369a7b1876216d..6c89c650961dc3e6bd139237baaaf2981ec36a7b 100644 (file)
@@ -83,6 +83,10 @@ jobs:
       run: CC=gcc ./config --banner=Configured enable-fips enable-quic --strict-warnings && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -96,6 +100,10 @@ jobs:
       run: CC=clang ./config --banner=Configured no-fips --strict-warnings && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -109,6 +117,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings no-bulk no-pic no-asm -DOPENSSL_NO_SECURE_MEMORY -DOPENSSL_SMALL_FOOTPRINT && perl configdata.pm --dump
     - name: make
       run: make -j4 # verbose, so no -s here
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -122,6 +134,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings no-deprecated enable-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -138,6 +154,8 @@ jobs:
       run: ./config --banner=Configured --strict-warnings no-shared no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -151,6 +169,10 @@ jobs:
       run: ./config --banner=Configured --debug enable-asan enable-ubsan no-cached-fetch no-fips no-dtls no-tls1 no-tls1-method no-tls1_1 no-tls1_1-method no-async && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0 TESTS="-test_fuzz* -test_ssl_* -test_sslapi -test_evp -test_cmp_http -test_verify -test_cms -test_store -test_enc -[01][0-9]"
 
@@ -164,6 +186,10 @@ jobs:
       run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-fips -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0
 
@@ -178,6 +204,10 @@ jobs:
       run: CC=clang ./config --banner=Configured --debug -O1 -fsanitize=memory -DOSSL_SANITIZE_MEMORY -fno-optimize-sibling-calls enable-rc5 enable-md2 enable-ec_nistp_64_gcc_128 enable-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0
 
@@ -191,6 +221,10 @@ jobs:
       run: CC=clang ./config --banner=Configured no-fips --strict-warnings -fsanitize=thread && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make V=1 TESTS="test_threads test_internal_provider test_provfetch test_provider test_pbe test_evp_kdf test_pkcs12 test_store test_evp test_quic*" test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -206,6 +240,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings no-ec enable-ssl-trace enable-zlib enable-zlib-dynamic enable-crypto-mdebug enable-crypto-mdebug-backtrace enable-egd enable-ktls enable-fips no-threads && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -221,6 +259,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings enable-ktls enable-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -239,6 +281,10 @@ jobs:
       run: ./config enable-comp enable-brotli enable-brotli-dynamic && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -257,6 +303,10 @@ jobs:
       run: ./config enable-comp enable-zstd enable-zstd-dynamic && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -276,6 +326,10 @@ jobs:
       run: ./config enable-comp enable-brotli enable-brotli-dynamic enable-zstd enable-zstd-dynamic && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -294,6 +348,10 @@ jobs:
       run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-comp enable-brotli -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DPEDANTIC && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0
 
@@ -312,6 +370,10 @@ jobs:
       run: ./config --banner=Configured --debug enable-asan enable-ubsan enable-comp enable-zstd -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -DPEDANTIC && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} OPENSSL_TEST_RAND_ORDER=0
 
@@ -325,6 +387,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings no-legacy enable-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -338,6 +404,10 @@ jobs:
       run: ./config --banner=Configured -Werror --debug no-afalgeng no-shared enable-crypto-mdebug enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -354,6 +424,8 @@ jobs:
       run: CC=gcc ./config --banner=Configured enable-tfo --strict-warnings && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -367,6 +439,10 @@ jobs:
       run: ./config --banner=Configured no-asm no-makedepend enable-buildtest-c++ enable-fips --strict-warnings -D_DEFAULT_SOURCE && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -389,6 +465,9 @@ jobs:
     - name: make
       run: make -s -j4
       working-directory: ./build
+    - name: get cpu info
+      run: ./util/opensslwrap.sh version -c
+      working-directory: ./build
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
       working-directory: ./build
@@ -416,6 +495,10 @@ jobs:
       run: ./config --banner=Configured --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests no-fips && perl configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: test external gost-engine
       run: make test TESTS="test_external_gost_engine"
     - name: test external krb5
@@ -451,6 +534,10 @@ jobs:
         toolchain: ${{ matrix.RUST }}
         override: true
         default: true
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: test external pyca
       run: make test TESTS="test_external_pyca" VERBOSE=1
 
@@ -469,5 +556,9 @@ jobs:
         profile: default
         toolchain: stable
         default: true
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: test external Cloudflare quiche
       run: make test TESTS="test_external_cf_quiche" VERBOSE=1
index 658d33f082a45da070a3ea9d93168f5477ff0dda..30634fccc3ffec9f7c2c06c4a11b1b419b25f5f0 100644 (file)
@@ -127,5 +127,9 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
index e22c0099c024d1dca84274fe5f6a5b24ad5320e8..d321bc483a662cfa18abebeceae445d0b319b5ae 100644 (file)
@@ -61,6 +61,10 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} TESTS='-test_external_krb5'
     - name: generate coverage info
index e2cd6cbb003a91f8602e2d043a54cc3993dcf40c..79af07c7016786a0c0140b050ffc4e6fb23f9453 100644 (file)
@@ -195,6 +195,9 @@ jobs:
       run: echo "OPENSSL_${{ matrix.platform.opensslcapsname }}=\
                  ${{ matrix.platform.opensslcaps }}" >> $GITHUB_ENV
 
+    - name: get cpu info
+      run: cat /proc/cpuinfo
+
     - name: make all tests
       if: github.event_name == 'push' && matrix.platform.tests == ''
       run: |
index 3e84fdbac6fc641b71587cb98af83564ffb6092c..766a4a1326ecb29d4964eaccb0d44c3c3f0ea648 100644 (file)
@@ -63,6 +63,10 @@ jobs:
     - name: make sans explicit linker
       if: matrix.fuzzy.linker == ''
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test restricted
       if: matrix.fuzzy.tests != ''
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} TESTS="${{ matrix.fuzzy.tests }}"
index 98fe0c744cc42c84e290300fee1823e34ba7339d..d3dc6770c31f1be59c2526dccf4448bc7737cd3a 100644 (file)
@@ -43,6 +43,10 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -89,6 +93,10 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -111,6 +119,10 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        sysctl machdep.cpu
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
 
@@ -141,6 +153,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake /S
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4
index e95a8475220c86e81912700aa93c7e3e87b3882f..ccb0fbdd7d803aa1f7031f4e1f4e3d8ba846f146 100644 (file)
@@ -10,7 +10,6 @@
 
 name: Provider compatibility across versions
 
-
 # NOTE: if this is being run on pull_request, it will **not** use the pull
 #       request's branch.  It is hardcoded to use the master branch.
 #
@@ -160,6 +159,12 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.branch.dir }}
 
+      - name: get cpu info
+        run: |
+          cat /proc/cpuinfo
+          ./util/opensslwrap.sh version -c
+        working-directory: ${{ matrix.branch.dir }}
+
       - name: make test
         run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
         working-directory: ${{ matrix.branch.dir }}
@@ -230,6 +235,12 @@ jobs:
                                                  -providers
         working-directory: ${{ matrix.tree_b }}
 
+      - name: get cpu info
+        run: |
+          cat /proc/cpuinfo
+          ./util/opensslwrap.sh version -c
+        working-directory: ${{ matrix.branch.dir }}
+
       - name: run cross validation tests of FIPS from A with tree from B
         if: steps.early_exit.outcome == 'success'
         run: |
index b4a20bcedd9361bbc40b9884cdc08b20ab7d793e..2b7ca84d86e7694506608c5250e2672cd4d3a6eb 100644 (file)
@@ -50,5 +50,9 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
index d258847e7e5f60b9910b44505001e558ff485311..ba9a5178f02f1fe9bdcc6cc03e2559d463c0c490 100644 (file)
@@ -43,6 +43,11 @@ jobs:
       if: steps.sctp_auth.outcome == 'success' && steps.sctp_auth.conclusion == 'success'
       run: make -s -j4
 
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
+
     - name: make test
       if: steps.sctp_auth.outcome == 'success' && steps.sctp_auth.conclusion == 'success'
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
index fe8a3a8e66c7948d9c1da406794a2df9bde05a46..fdd07294a4a147515083275a1f25ad2767fae3f5 100644 (file)
@@ -144,5 +144,9 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
index 31148bf0b82d5cf7d324e1c9d423b3663215059a..461f16527d557a0d08411986abc09fbdde44deb0 100644 (file)
@@ -46,5 +46,9 @@ jobs:
       run: ./configdata.pm --dump
     - name: make
       run: make -s -j4
+    - name: get cpu info
+      run: |
+        cat /proc/cpuinfo
+        ./util/opensslwrap.sh version -c
     - name: make test
       run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
index 9c32d2689bd2e0b2ac8fa6092e0b02f4478dc718..29ad9689e943e344882620e8a963d428b5e6ae35 100644 (file)
@@ -47,6 +47,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake /S
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        ./apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
@@ -80,6 +91,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake /S
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        ./apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes HARNESS_JOBS=4
@@ -106,6 +128,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake # verbose, so no /S here
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        ./apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: nmake test VERBOSE_FAILURE=yes TESTS=-test_fuzz* HARNESS_JOBS=4
index 8f19b812a735027a75c34974c352210ed01ff213..3ffd5f2e720a0379ead33b0609eb9e0decc7ccf4 100644 (file)
@@ -41,6 +41,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        ./apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: |
@@ -68,6 +79,17 @@ jobs:
     - name: build
       working-directory: _build
       run: nmake
+    - name: download coreinfo
+      uses: suisei-cn/actions-download-file@v1.3.0
+      with:
+        url: "https://download.sysinternals.com/files/Coreinfo.zip"
+        target: _build/coreinfo/
+    - name: get cpu info
+      working-directory: _build
+      run: |
+        7z.exe x coreinfo/Coreinfo.zip
+        ./Coreinfo64.exe -accepteula -f
+        ./apps/openssl.exe version -c
     - name: test
       working-directory: _build
       run: |