Skip to content

Commit d035d23

Browse files
authored
Merge pull request #127 from MarcoFalke/main
ci: Move .git folder as well
2 parents fe7b5de + 1aa127f commit d035d23

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

.cirrus.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ task:
3434
task:
3535
name: "[native_fuzz_with_valgrind] [persistent_worker]"
3636
persistent_worker: {} # https://cirrus-ci.org/guide/persistent-workers/ , PERSISTENT_WORKER_TEMPLATE
37-
timeout_in: 2160m
37+
timeout_in: 4320m
3838
env:
3939
FILE_ENV: "./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
4040
MAKEJOBS: "-j6"
@@ -47,7 +47,7 @@ task:
4747
- apt update && apt install git -y
4848
- git clone https://github.com/bitcoin/bitcoin --depth=1 ./bitcoin-core
4949
- mkdir -p ./bitcoin-core/ci/scratch/qa-assets
50-
- mv ./fuzz_seed_corpus ./bitcoin-core/ci/scratch/qa-assets/
50+
- mv ./{.git,fuzz_seed_corpus} ./bitcoin-core/ci/scratch/qa-assets/
5151
ci_script:
5252
- cd ./bitcoin-core
5353
- ./ci/test_run_all.sh
@@ -68,14 +68,12 @@ task:
6868
ccache_cache:
6969
folder: "/tmp/ccache_dir"
7070
upstream_clone_script:
71-
- cd /tmp
7271
- apt update && apt install git -y
7372
- git clone https://github.com/bitcoin/bitcoin --depth=1 ./bitcoin-core
74-
- mkdir -p /tmp/bitcoin-core/ci/scratch
75-
- mv /tmp/cirrus-ci-build /tmp/bitcoin-core/ci/scratch/qa-assets
73+
- mkdir -p ./bitcoin-core/ci/scratch/qa-assets
74+
- mv ./{.git,fuzz_seed_corpus} ./bitcoin-core/ci/scratch/qa-assets/
7675
ci_script:
77-
- cd /tmp/bitcoin-core
78-
- sed -i 's|FuzzedDataProvider fuzzed_data_provider|return;FuzzedDataProvider fuzzed_data_provider|g' ./src/test/fuzz/strprintf.cpp # Avoid tinyformat issue
76+
- cd ./bitcoin-core
7977
- ./ci/test_run_all.sh
8078
task:
8179
name: "[native_fuzz] [lunar]"
@@ -94,11 +92,10 @@ task:
9492
ccache_cache:
9593
folder: "/tmp/ccache_dir"
9694
upstream_clone_script:
97-
- cd /tmp
9895
- apt update && apt install git -y
9996
- git clone https://github.com/bitcoin/bitcoin --depth=1 ./bitcoin-core
100-
- mkdir -p /tmp/bitcoin-core/ci/scratch
101-
- mv /tmp/cirrus-ci-build /tmp/bitcoin-core/ci/scratch/qa-assets
97+
- mkdir -p ./bitcoin-core/ci/scratch/qa-assets
98+
- mv ./{.git,fuzz_seed_corpus} ./bitcoin-core/ci/scratch/qa-assets/
10299
ci_script:
103-
- cd /tmp/bitcoin-core
100+
- cd ./bitcoin-core
104101
- ./ci/test_run_all.sh

0 commit comments

Comments
 (0)