Skip to content

Commit deb2b27

Browse files
author
MarcoFalke
committed
Merge #20294: ci: Run more ci configs on cirrus
fa8e494 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 fa8e494: patch looks correct decryp2kanon: reACK fa8e494 Tree-SHA512: e2d1838050b6199d11fa06d1cc9d804883ec5df7d65386c950e8124c0067dc1aaa62ec84c9842c8263e2cf5b17fc819ce85689338113f8d69edb1954f06e76e2
2 parents ed9f547 + fa8e494 commit deb2b27

File tree

2 files changed

+40
-25
lines changed

2 files changed

+40
-25
lines changed

.cirrus.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,14 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
5252
# install_script:
5353
# - choco install python --version=3.7.7 -y
5454

55+
task:
56+
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
57+
<< : *GLOBAL_TASK_TEMPLATE
58+
container:
59+
image: ubuntu:bionic
60+
env:
61+
FILE_ENV: "./ci/test/00_setup_env_native_qt5.sh"
62+
5563
task:
5664
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: thread (TSan), no gui]'
5765
<< : *GLOBAL_TASK_TEMPLATE
@@ -63,6 +71,14 @@ task:
6371
MAKEJOBS: "-j8"
6472
FILE_ENV: "./ci/test/00_setup_env_native_tsan.sh"
6573

74+
task:
75+
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]'
76+
<< : *GLOBAL_TASK_TEMPLATE
77+
container:
78+
image: ubuntu:focal
79+
env:
80+
FILE_ENV: "./ci/test/00_setup_env_native_msan.sh"
81+
6682
task:
6783
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: address/leak (ASan + LSan) + undefined (UBSan) + integer]'
6884
<< : *GLOBAL_TASK_TEMPLATE
@@ -71,10 +87,34 @@ task:
7187
env:
7288
FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
7389

90+
task:
91+
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
92+
<< : *GLOBAL_TASK_TEMPLATE
93+
container:
94+
image: ubuntu:focal
95+
env:
96+
FILE_ENV: "./ci/test/00_setup_env_native_fuzz.sh"
97+
7498
task:
7599
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, fuzzers under valgrind]'
76100
<< : *GLOBAL_TASK_TEMPLATE
77101
container:
78102
image: ubuntu:focal
79103
env:
80104
FILE_ENV: "./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
105+
106+
task:
107+
name: 'x86_64 Linux [GOAL: install] [focal] [multiprocess]'
108+
<< : *GLOBAL_TASK_TEMPLATE
109+
container:
110+
image: ubuntu:focal
111+
env:
112+
FILE_ENV: "./ci/test/00_setup_env_native_multiprocess.sh"
113+
114+
task:
115+
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
116+
<< : *GLOBAL_TASK_TEMPLATE
117+
container:
118+
image: ubuntu:bionic
119+
env:
120+
FILE_ENV: "./ci/test/00_setup_env_mac.sh"

.travis.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -89,36 +89,11 @@ jobs:
8989
env: >-
9090
FILE_ENV="./ci/test/00_setup_env_i686_centos.sh"
9191
92-
- stage: test
93-
name: 'x86_64 Linux [GOAL: install] [bionic] [C++17, previous releases, uses qt5 dev package and some depends packages] [unsigned char]'
94-
env: >-
95-
FILE_ENV="./ci/test/00_setup_env_native_qt5.sh"
96-
97-
- stage: test
98-
name: 'x86_64 Linux [GOAL: install] [focal] [depends, sanitizers: memory (MSan)]'
99-
env: >-
100-
FILE_ENV="./ci/test/00_setup_env_native_msan.sh"
101-
102-
- stage: test
103-
name: 'x86_64 Linux [GOAL: install] [focal] [no depends, only system libs, sanitizers: fuzzer,address,undefined]'
104-
env: >-
105-
FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
106-
107-
- stage: test
108-
name: 'x86_64 Linux [GOAL: install] [focal] [multiprocess]'
109-
env: >-
110-
FILE_ENV="./ci/test/00_setup_env_native_multiprocess.sh"
111-
11292
- stage: test
11393
name: 'x86_64 Linux [GOAL: install] [xenial] [no wallet]'
11494
env: >-
11595
FILE_ENV="./ci/test/00_setup_env_native_nowallet.sh"
11696
117-
- stage: test
118-
name: 'macOS 10.12 [GOAL: deploy] [no functional tests]'
119-
env: >-
120-
FILE_ENV="./ci/test/00_setup_env_mac.sh"
121-
12297
- stage: test
12398
name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
12499
os: osx

0 commit comments

Comments
 (0)