From 698aa3e98e77b72b6ee6902e93afebb3b2c2f837 Mon Sep 17 00:00:00 2001 From: Luca Bertagna Date: Wed, 13 Nov 2024 12:26:02 -0700 Subject: [PATCH] Mergify: fix merge proteciton rule The name of skipped jobs from a matrix needed to be fixed --- .mergify.yml | 51 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index ee3e186f509..d60ffc9007e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -7,38 +7,25 @@ merge_protections: - "#approved-reviews-by >= 1" # At least 1 approval - "#changes-requested-reviews-by == 0" # No reviewer asked for changes - or: - - check-success="gcc-openmp / dbg" - - check-skipped="gcc-openmp / dbg" - - or: - - check-success="gcc-openmp / sp" - - check-skipped="gcc-openmp / sp" - - or: - - check-success="gcc-openmp / fpe" - - check-skipped="gcc-openmp / fpe" - - or: - - check-success="gcc-openmp / opt" - - check-skipped="gcc-openmp / opt" - - or: - - check-success="gcc-cuda / dbg" - - check-skipped="gcc-cuda / dbg" - - or: - - check-success="gcc-cuda / sp" - - check-skipped="gcc-cuda / sp" - - or: - - check-success="gcc-cuda / opt" - - check-skipped="gcc-cuda / opt" - - or: - - check-success="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" - - check-skipped="cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" - - or: - - check-success="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" - - check-skipped="cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" - - or: - - check-success="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" - - check-skipped="cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" - - or: - - check-success="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" - - check-skipped="cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" + - and: + - "check-success=gcc-openmp / dbg" + - "check-success=gcc-openmp / sp" + - "check-success=gcc-openmp / fpe" + - "check-success=gcc-openmp / opt" + - "check-skipped=gcc-openmp / ${{ matrix.build_type }}" + - or: + - and: + - "check-success=gcc-cuda / dbg" + - "check-success=gcc-cuda / sp" + - "check-success=gcc-cuda / opt" + - "check-skipped=gcc-cuda / ${{ matrix.build_type }}" + - or: + - and: + - "check-success=cpu-gcc / ERS_Ln9.ne4_ne4.F2000-SCREAMv1-AQP1.scream-output-preset-2" + - "check-success=cpu-gcc / ERS_P16_Ln22.ne30pg2_ne30pg2.FIOP-SCREAMv1-DP.scream-dpxx-arm97" + - "check-success=cpu-gcc / ERS_Ln22.ne4pg2_ne4pg2.F2010-SCREAMv1.scream-small_kernels--scream-output-preset-5" + - "check-success=cpu-gcc / SMS_D_Ln5.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.scream-mam4xx-all_mam4xx_procs" + - "check-skipped=cpu-gcc / ${{ matrix.test.short_name }}" - or: - check-success=cpu-gcc - check-skipped=cpu-gcc