From 3f4d6464ee2463291b5d6b65d8c40d6430c3c360 Mon Sep 17 00:00:00 2001
From: Enrico Tassi
Date: Wed, 9 Dec 2020 17:44:03 +0100
Subject: [ci] simplify overlay scripts

---
 dev/tools/create_overlays.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'dev/tools')

diff --git a/dev/tools/create_overlays.sh b/dev/tools/create_overlays.sh
index 78ed27ba03..ac8fd1676d 100755
--- a/dev/tools/create_overlays.sh
+++ b/dev/tools/create_overlays.sh
@@ -42,7 +42,7 @@ OVERLAY_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 OVERLAY_FILE=$(mktemp overlay-XXXX)
 
 # Create the overlay file
-printf 'if [ "$CI_PULL_REQUEST" = "%s" ] || [ "$CI_BRANCH" = "%s" ]; then\n\n' "$PR_NUMBER" "$OVERLAY_BRANCH" > "$OVERLAY_FILE"
+> "$OVERLAY_FILE"
 
 # We first try to build the contribs
 while test $# -gt 0
@@ -66,12 +66,11 @@ do
     make ci-$_CONTRIB_NAME || true
     setup_contrib_git $_CONTRIB_DIR $_CONTRIB_GITPUSHURL
 
-    echo "    overlay ${_CONTRIB_NAME} $_CONTRIB_GITURL $OVERLAY_BRANCH" >> $OVERLAY_FILE
+    echo "overlay ${_CONTRIB_NAME} $_CONTRIB_GITURL $OVERLAY_BRANCH $PR_NUMBER" >> $OVERLAY_FILE
     echo "" >> $OVERLAY_FILE
     shift
 done
 
-# End the file; copy to overlays folder.
-echo "fi" >> $OVERLAY_FILE
+# Copy to overlays folder.
 PR_NUMBER=$(printf '%05d' "$PR_NUMBER")
 mv $OVERLAY_FILE dev/ci/user-overlays/$PR_NUMBER-$DEVELOPER_NAME-${OVERLAY_BRANCH///}.sh
-- 
cgit v1.2.3