Skip to content

Commit 6f30ec5

Browse files
committed
Mergify: fix syntax
1 parent 8f96dfe commit 6f30ec5

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

.mergify.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,17 @@ merge_protections:
44
if:
55
- base = master
66
success_conditions:
7-
- "#approved >= 1" # At least 1 approval
8-
- "#changes-requested == 0" # No reviewer asked for changes
7+
- "#approved-reviews-by >= 1" # At least 1 approval
8+
- "#changes-requested-reviews-by == 0" # No reviewer asked for changes
99
- or:
10-
- and:
11-
- check-success=eamxx-sa/gcc-openmp/sp
12-
- check-success=eamxx-sa/gcc-openmp/dbg
13-
- check-success=eamxx-sa/gcc-openmp/fpe
14-
- check-success=eamxx-sa/gcc-openmp/opt
15-
- check-skipped="eamxx-sa/gcc-openmp/${{matrix.build_type}}"
10+
- check-success=eamxx-sa/gcc-openmp/*
11+
- check-skipped=eamxx-sa/gcc-openmp/*
1612
- or:
17-
- and:
18-
- check-success=eamxx-sa/gcc-cuda/sp
19-
- check-success=eamxx-sa/gcc-cuda/dbg
20-
- check-success=eamxx-sa/gcc-cuda/opt
21-
- check-skipped="eamxx-sa/gcc-cuda/${{matrix.build_type}}"
13+
- check-success=eamxx-sa/gcc-cuda/*
14+
- check-skipped=eamxx-sa/gcc-cuda/*
2215
- or:
23-
- and:
24-
- check-success=eamxx-v1/cpu-gcc/ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2
25-
- check-success=eamxx-v1/cpu-gcc/ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97
26-
- check-success=eamxx-v1/cpu-gcc/ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5
27-
- check-success=eamxx-v1/cpu-gcc/SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs
28-
- check-skipped="eamxx-v1/cpu-gcc-/${{matrix.test.short_name}}"
16+
- check-success=eamxx-v1/cpu-gcc/*
17+
- check-skipped=eamxx-v1/cpu-gcc/*
2918
- or:
3019
- check-success=eamxx-scripts/cpu-gcc
3120
- check-skipped=eamxx-scripts/cpu-gcc

0 commit comments

Comments
 (0)