3 files changed, 9 insertions, 27 deletions
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
diff --git a/dev/tools/notify-upstream-pins.sh b/dev/tools/notify-upstream-pins.sh
index 37fe0cbcbf..ebf920b0f7 100755
--- a/dev/tools/notify-upstream-pins.sh
+++ b/dev/tools/notify-upstream-pins.sh
@@ -14,24 +14,6 @@ REASON="bundled in the Windows installer"
 git show master:dev/ci/ci-basic-overlay.sh > /tmp/master-ci-basic-overlay.sh
 git show v${VERSION}:dev/ci/ci-basic-overlay.sh > /tmp/branch-ci-basic-overlay.sh
 
-# caveats:
-# - dev/ci/gitlab.bat has \r (windows)
-# - aactactics, gappa, HB, extlib have different names in ci
-# - menhir is not pinned but figures as an addon
-# - unicoq is not an addon
-WINDOWS_ADDONS=$(grep addon= dev/ci/gitlab.bat \
-  | cut -d = -f 2 \
-  | cut -d ' ' -f 1 \
-  | tr -d '\r' \
-  | sed -e 's/^aactactics$/aac_tactics/' \
-        -e 's/^gappa$/gappa_plugin/' \
-        -e 's/^HB$/elpi_hb/' \
-        -e 's/^extlib$/ext_lib/' \
-        \
-        -e '/^menhir$/d' \
-  ) \
-WINDOWS_ADDONS="$WINDOWS_ADDONS unicoq"
-
 # reads a variable value from a ci-basic-overlay.sh file
 function read_from() {
   ( . $1; varname="$2"; echo ${!varname} )
@@ -99,7 +81,10 @@ $CC
   esac
 }
 
-for addon in $WINDOWS_ADDONS; do
+# TODO: filter w.r.t. what is in the platform
+PROJECTS=`read_from /tmp/branch-ci-basic-overlay.sh "projects[@]"`
+
+for addon in $PROJECTS; do
     URL=`read_from /tmp/master-ci-basic-overlay.sh "${addon}_CI_GITURL"`
     REF=`read_from /tmp/master-ci-basic-overlay.sh "${addon}_CI_REF"`
     PIN=`read_from /tmp/branch-ci-basic-overlay.sh "${addon}_CI_REF"`
diff --git a/dev/tools/pin-ci.sh b/dev/tools/pin-ci.sh
index dbf54d7f0a..676688bedc 100755
--- a/dev/tools/pin-ci.sh
+++ b/dev/tools/pin-ci.sh
@@ -38,9 +38,7 @@ process_development() {
 # Execute the script to set the overlay variables
 . $OVERLAYS
 
-# Find all variables declared in the base overlay of the form *_CI_GITURL
-for REPO_VAR in $(compgen -A variable | grep _CI_GITURL)
+for project in ${projects[@]}
 do
-  DEV=${REPO_VAR%_CI_GITURL}
-  process_development $DEV
+  process_development $project
 done