From 1e98e2e126e543fb832622412e4b00e5c8a90dd6 Mon Sep 17 00:00:00 2001 From: N-R-K Date: Mon, 30 May 2022 11:37:57 +0000 Subject: [PATCH] improve patch conflict ci script goes through all different combinations automatically and makes adding another patch easier by simply putting the name into the patches array. --- .github/workflows/ci.yml | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9394e0c6..57295188 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,26 +43,12 @@ jobs: env: CC: gcc run: | - export CFLAGS="$CFLAGS -Werror" - make clean - echo "########## O_NAMEFIRST=1 ##########" - make O_NAMEFIRST=1 - make clean - echo "########## O_GITSTATUS=1 ##########" - make O_GITSTATUS=1 - make clean - echo "########## O_RESTOREPREVIEW=1 ##########" - make O_RESTOREPREVIEW=1 - make clean - echo "########## O_NAMEFIRST=1 O_GITSTATUS=1 ##########" - make O_NAMEFIRST=1 O_GITSTATUS=1 - make clean - echo "########## O_NAMEFIRST=1 O_RESTOREPREVIEW=1 ##########" - make O_NAMEFIRST=1 O_RESTOREPREVIEW=1 - make clean - echo "########## O_GITSTATUS=1 O_RESTOREPREVIEW=1 ##########" - make O_GITSTATUS=1 O_RESTOREPREVIEW=1 - make clean - echo "########## O_NAMEFIRST=1 O_GITSTATUS=1 O_RESTOREPREVIEW=1 ##########" - make O_NAMEFIRST=1 O_GITSTATUS=1 O_RESTOREPREVIEW=1 - make clean + patches=("O_GITSTATUS" "O_NAMEFIRST" "O_RESTOREPREVIEW") + z=$(( 1 << ${#patches[@]} )) + for ((n=1; n < z; ++n)); do + for ((i=0; i < ${#patches[@]}; ++i)); do + printf "%s=%d " "${patches[$i]}" "$(( (n & (1 << i)) != 0 ))" + done | tee "tmp" ; echo + make clean + xargs make <"tmp" + done