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)
This commit is contained in:
parent
6bba373ec3
commit
5fce85ec52
27
.github/workflows/run-checker-daily.yml
vendored
27
.github/workflows/run-checker-daily.yml
vendored
@ -48,6 +48,7 @@ jobs:
|
|||||||
no-crypto-mdebug,
|
no-crypto-mdebug,
|
||||||
enable-crypto-mdebug-backtrace,
|
enable-crypto-mdebug-backtrace,
|
||||||
no-crypto-mdebug-backtrace,
|
no-crypto-mdebug-backtrace,
|
||||||
|
no-ct,
|
||||||
no-deprecated,
|
no-deprecated,
|
||||||
no-des,
|
no-des,
|
||||||
no-devcryptoeng,
|
no-devcryptoeng,
|
||||||
@ -196,32 +197,6 @@ jobs:
|
|||||||
if: steps.sctp_auth.outcome == 'success' && steps.sctp_auth.conclusion == 'success'
|
if: steps.sctp_auth.outcome == 'success' && steps.sctp_auth.conclusion == 'success'
|
||||||
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
|
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:
|
enable_brotli_dynamic:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
27
.github/workflows/run-checker-merge.yml
vendored
27
.github/workflows/run-checker-merge.yml
vendored
@ -19,7 +19,6 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
opt: [
|
opt: [
|
||||||
enable-asan enable-ubsan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT,
|
enable-asan enable-ubsan no-shared no-asm -DOPENSSL_SMALL_FOOTPRINT,
|
||||||
no-ct,
|
|
||||||
no-dso,
|
no-dso,
|
||||||
no-dynamic-engine,
|
no-dynamic-engine,
|
||||||
no-ec2m enable-fips,
|
no-ec2m enable-fips,
|
||||||
@ -59,3 +58,29 @@ jobs:
|
|||||||
if [ -x apps/openssl ] ; then ./util/opensslwrap.sh version -c ; fi
|
if [ -x apps/openssl ] ; then ./util/opensslwrap.sh version -c ; fi
|
||||||
- name: make test
|
- name: make test
|
||||||
run: make test HARNESS_JOBS=${HARNESS_JOBS:-4}
|
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}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user