From fab8cd5f8764883dc48695c0e0916bae42f1cfdc Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 8 Feb 2022 20:19:44 +0100 Subject: Revert "ci: Run fuzzer task for the master branch only" This reverts commit 5a9e255e5a324e7aa0b63a9634aa3cfda9a300bd. --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fec4975080..d9ee048913 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -237,7 +237,6 @@ task: task: name: '[fuzzer,address,undefined,integer, no depends] [focal]' - only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal -- cgit v1.2.3 From fa27745ccbdf8df7949a2e79dba18de49dc89169 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 8 Feb 2022 20:24:47 +0100 Subject: ci: Bump fuzz tasks to jammy This gives them a newer clang version, which may have more sanitizers available. --- .cirrus.yml | 4 ++-- ci/test/00_setup_env_native_fuzz.sh | 2 +- ci/test/00_setup_env_native_fuzz_with_valgrind.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d9ee048913..e9500617f4 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -236,10 +236,10 @@ task: MAKEJOBS: "-j4" # Avoid excessive memory use task: - name: '[fuzzer,address,undefined,integer, no depends] [focal]' + name: '[fuzzer,address,undefined,integer, no depends] [jammy]' << : *GLOBAL_TASK_TEMPLATE container: - image: ubuntu:focal + image: ubuntu:jammy cpu: 4 # Increase CPU and memory to avoid timeout memory: 16G env: diff --git a/ci/test/00_setup_env_native_fuzz.sh b/ci/test/00_setup_env_native_fuzz.sh index af03ac4f5d..ca301745b7 100755 --- a/ci/test/00_setup_env_native_fuzz.sh +++ b/ci/test/00_setup_env_native_fuzz.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -export DOCKER_NAME_TAG="ubuntu:20.04" +export DOCKER_NAME_TAG="ubuntu:22.04" export CONTAINER_NAME=ci_native_fuzz export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-test-dev libsqlite3-dev" export NO_DEPENDS=1 diff --git a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh index 607c0a43d0..9814fb243f 100755 --- a/ci/test/00_setup_env_native_fuzz_with_valgrind.sh +++ b/ci/test/00_setup_env_native_fuzz_with_valgrind.sh @@ -6,7 +6,7 @@ export LC_ALL=C.UTF-8 -export DOCKER_NAME_TAG="ubuntu:20.04" +export DOCKER_NAME_TAG="ubuntu:22.04" export CONTAINER_NAME=ci_native_fuzz_valgrind export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-test-dev libsqlite3-dev valgrind" export NO_DEPENDS=1 -- cgit v1.2.3