Skip to content

Commit

Permalink
Merge bitcoin#24292: Revert "ci: Run fuzzer task for the master branc…
Browse files Browse the repository at this point in the history
…h 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
  • Loading branch information
fanquake authored and jagdeep sidhu committed Feb 22, 2022
1 parent ae8ff85 commit 59a50a1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .cirrus.yml
Expand Up @@ -231,11 +231,10 @@ task:
MAKEJOBS: "-j4" # Avoid excessive memory use

task:
name: '[fuzzer,address,undefined,integer, no depends] [focal]'
only_if: $CIRRUS_BRANCH == $CIRRUS_DEFAULT_BRANCH || $CIRRUS_BASE_BRANCH == $CIRRUS_DEFAULT_BRANCH
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:
Expand Down
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_native_fuzz.sh
Expand Up @@ -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 libsqlite3-dev libgmp3-dev libcurl4-gnutls-dev"
export NO_DEPENDS=1
Expand Down
2 changes: 1 addition & 1 deletion ci/test/00_setup_env_native_fuzz_with_valgrind.sh
Expand Up @@ -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 libsqlite3-dev valgrind libgmp3-dev libcurl4-gnutls-dev"
export NO_DEPENDS=1
Expand Down

0 comments on commit 59a50a1

Please sign in to comment.