diff options
| author | Gaëtan Gilbert | 2020-10-12 12:35:05 +0200 |
|---|---|---|
| committer | Gaëtan Gilbert | 2020-10-12 12:40:52 +0200 |
| commit | c4f5d75bfef926c186272e2be5bdd1968db3fe88 (patch) | |
| tree | fa8f101a44de7d5e1c1ca8c4cb854a65e2fc591a /dev/tools | |
| parent | 6a0aad2f334a050f097de80162b8bfb4738459aa (diff) | |
Automatically merge overlays with most recent upstream version
This avoids the need to rebase the overlay when nothing has changed.
Diffstat (limited to 'dev/tools')
| -rwxr-xr-x | dev/tools/create_overlays.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dev/tools/create_overlays.sh b/dev/tools/create_overlays.sh index ad60b1115f..78ed27ba03 100755 --- a/dev/tools/create_overlays.sh +++ b/dev/tools/create_overlays.sh @@ -66,8 +66,7 @@ do make ci-$_CONTRIB_NAME || true setup_contrib_git $_CONTRIB_DIR $_CONTRIB_GITPUSHURL - echo " ${_CONTRIB_NAME}_CI_REF=$OVERLAY_BRANCH" >> $OVERLAY_FILE - echo " ${_CONTRIB_NAME}_CI_GITURL=$_CONTRIB_GITURL" >> $OVERLAY_FILE + echo " overlay ${_CONTRIB_NAME} $_CONTRIB_GITURL $OVERLAY_BRANCH" >> $OVERLAY_FILE echo "" >> $OVERLAY_FILE shift done |