Skip to content

Commit 2ab4fbe

Browse files
committed
Merge bitcoin/bitcoin#24292: Revert "ci: Run fuzzer task for the master branch only"
fa27745 ci: Bump fuzz tasks to jammy (MarcoFalke) fab8cd5 Revert "ci: Run fuzzer task for the master branch only" (MarcoFalke) Pull request description: This reverts commit 5a9e255. I think we should attempt to maintain the fuzz tasks for release branches as well. If it is too difficult for one branch, it could make sense to disable it for that branch, but not for all branches unconditionally. Also, bump to jammy. ACKs for top commit: fanquake: ACK fa27745 - we'll see how we go with the 23.x release branch. Tree-SHA512: d6d08e7dce0884b556c51ff1896aebbbb5a805c22decd58af81a04192d19876978696017b489ec55886ddfd5c022963baaab5f11022369ae5291016826ff8017
2 parents 1337b93 + fa27745 commit 2ab4fbe

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.cirrus.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,10 @@ task:
236236
MAKEJOBS: "-j4" # Avoid excessive memory use
237237

238238
task:
239-
name: '[fuzzer,address,undefined,integer, no depends] [focal]'
240-
only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
239+
name: '[fuzzer,address,undefined,integer, no depends] [jammy]'
241240
<< : *GLOBAL_TASK_TEMPLATE
242241
container:
243-
image: ubuntu:focal
242+
image: ubuntu:jammy
244243
cpu: 4 # Increase CPU and memory to avoid timeout
245244
memory: 16G
246245
env:

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export DOCKER_NAME_TAG="ubuntu:20.04"
9+
export DOCKER_NAME_TAG="ubuntu:22.04"
1010
export CONTAINER_NAME=ci_native_fuzz
1111
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libsqlite3-dev"
1212
export NO_DEPENDS=1

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
export LC_ALL=C.UTF-8
88

9-
export DOCKER_NAME_TAG="ubuntu:20.04"
9+
export DOCKER_NAME_TAG="ubuntu:22.04"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
1111
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1

0 commit comments

Comments
 (0)