diff options
| author | Tomas Mraz <tomas@openssl.org> | 2024-12-04 11:20:08 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2024-12-06 15:36:57 +0100 |
| commit | 5fce85ec52a826d53665552b50e67f86c92dc394 (patch) | |
| tree | a92e778d36ee47e77aa7b4a36bb63a6e1c40b597 /.github | |
| parent | jitter_generate(): Properly mix in the additional input (diff) | |
| download | openssl-5fce85ec52a826d53665552b50e67f86c92dc394.tar.xz openssl-5fce85ec52a826d53665552b50e67f86c92dc394.zip | |
Exchange jitter and no-ct jobs between daily and on push CI
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26112)
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/run-checker-daily.yml | 27 | ||||
| -rw-r--r-- | .github/workflows/run-checker-merge.yml | 27 |
2 files changed, 27 insertions, 27 deletions
diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml index 6df9e6d54b..cb3087a15e 100644 --- a/.github/workflows/run-checker-daily.yml +++ b/.github/workflows/run-checker-daily.yml @@ -48,6 +48,7 @@ jobs: no-crypto-mdebug, enable-crypto-mdebug-backtrace, no-crypto-mdebug-backtrace, + no-ct, no-deprecated, no-des, no-devcryptoeng, @@ -196,32 +197,6 @@ jobs: if: steps.sctp_auth.outcome == 'success' && steps.sctp_auth.conclusion == 'success' run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} - jitter: - runs-on: ubuntu-latest - steps: - - name: checkout openssl - uses: actions/checkout@v4 - - name: checkout jitter - uses: actions/checkout@v4 - with: - repository: smuellerDD/jitterentropy-library - ref: v3.5.0 - path: jitter - - name: build jitter - run: make -C jitter/ - - name: checkout fuzz/corpora submodule - run: git submodule update --init --depth 1 fuzz/corpora - - name: config - run: ./config --with-rand-seed=none enable-jitter enable-fips-jitter --with-jitter-include=jitter/ --with-jitter-lib=jitter/ -DOPENSSL_DEFAULT_SEED_SRC=JITTER && 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} - enable_brotli_dynamic: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/run-checker-merge.yml b/.github/workflows/run-checker-merge.yml index 1ff4fe7d3d..0f29cf7a80 100644 --- a/.github/workflows/run-checker-merge.yml +++ b/.github/workflows/run-checker-merge.yml @@ -19,7 +19,6 @@ jobs: matrix: opt: [ enable-asan enable-ubsan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT, - no-ct, no-dso, no-dynamic-engine, no-ec2m enable-fips, @@ -59,3 +58,29 @@ jobs: if [ -x apps/openssl ] ; then ./util/opensslwrap.sh version -c ; fi - name: make test run: make test HARNESS_JOBS=${HARNESS_JOBS:-4} + + jitter: + runs-on: ubuntu-latest + steps: + - name: checkout openssl + uses: actions/checkout@v4 + - name: checkout jitter + uses: actions/checkout@v4 + with: + repository: smuellerDD/jitterentropy-library + ref: v3.5.0 + path: jitter + - name: build jitter + run: make -C jitter/ + - name: checkout fuzz/corpora submodule + run: git submodule update --init --depth 1 fuzz/corpora + - name: config + run: ./config --with-rand-seed=none enable-jitter enable-fips-jitter --with-jitter-include=jitter/ --with-jitter-lib=jitter/ -DOPENSSL_DEFAULT_SEED_SRC=JITTER && 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} |