diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2020-11-04 20:12:56 +0100 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2020-11-04 20:13:08 +0100 |
| commit | deb2b27c0d9910a4e522c0f9d500d863468e8ee2 (patch) | |
| tree | a580bfa56ed133d68eef8d7c6023c6ed73f4973b | |
| parent | ed9f5477502e5856eba742656e8fc0fcf7bb053b (diff) | |
| parent | fa8e494554d0f5f8f48bb33ce96a8d7de9b95e31 (diff) | |
| download | bitcoin-deb2b27c0d9910a4e522c0f9d500d863468e8ee2.tar.xz | |
Merge #20294: ci: Run more ci configs on cirrus
fa8e494554d0f5f8f48bb33ce96a8d7de9b95e31 ci: Run ci configs on cirrus (MarcoFalke)
Pull request description:
Now that cirrus ci runs more stable than travis ci, we can try to move more configs over there to see if any issues arise.
ACKs for top commit:
practicalswift:
ACK fa8e494554d0f5f8f48bb33ce96a8d7de9b95e31: patch looks correct
decryp2kanon:
reACK fa8e494554d0f5f8f48bb33ce96a8d7de9b95e31
Tree-SHA512: e2d1838050b6199d11fa06d1cc9d804883ec5df7d65386c950e8124c0067dc1aaa62ec84c9842c8263e2cf5b17fc819ce85689338113f8d69edb1954f06e76e2
| -rw-r--r-- | .cirrus.yml | 40 | ||||
| -rw-r--r-- | .travis.yml | 25 |
2 files changed, 40 insertions, 25 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5dc7e7995a..f334da5c14 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -53,6 +53,14 @@ global_task_template: &GLOBAL_TASK_TEMPLATE # - choco install python --version=3.7.7 -y task: + name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:bionic + env: + FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh" + +task: name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]' << : *GLOBAL_TASK_TEMPLATE container: @@ -64,6 +72,14 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh" task: + name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:focal + env: + FILE_ENV: "./ci/test/00_setup_env_native_msan.sh" + +task: name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]' << : *GLOBAL_TASK_TEMPLATE container: @@ -72,9 +88,33 @@ task: FILE_ENV: "./ci/test/00_setup_env_native_asan.sh" task: + name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:focal + env: + FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh" + +task: name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, fuzzers under valgrind]' << : *GLOBAL_TASK_TEMPLATE container: image: ubuntu:focal env: FILE_ENV: "./ci/test/00_setup_env_native_fuzz_with_valgrind.sh" + +task: + name: 'x86_64 Linux [GOAL: install] [focal] [multiprocess]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:focal + env: + FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh" + +task: + name: 'macOS 10.12 [GOAL: deploy] [no functional tests]' + << : *GLOBAL_TASK_TEMPLATE + container: + image: ubuntu:bionic + env: + FILE_ENV: "./ci/test/00_setup_env_mac.sh" diff --git a/.travis.yml b/.travis.yml index 42fa653d8c..5c8049aada 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,36 +90,11 @@ jobs: FILE_ENV="./ci/test/00_setup_env_i686_centos.sh" - stage: test - name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_qt5.sh" - - - stage: test - name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_msan.sh" - - - stage: test - name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh" - - - stage: test - name: 'x86_64 Linux [GOAL: install] [focal] [multiprocess]' - env: >- - FILE_ENV="./ci/test/00_setup_env_native_multiprocess.sh" - - - stage: test name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]' env: >- FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh" - stage: test - name: 'macOS 10.12 [GOAL: deploy] [no functional tests]' - env: >- - FILE_ENV="./ci/test/00_setup_env_mac.sh" - - - stage: test name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]' os: osx # Use the most recent version: |