chore: move v2 forward merge as a CodeBuild job (#10911)

This will be moved to cdk-ops as a CodeBuild job. The benefits are that (a) we can add alarms when this job fails, (b) it doesn't run (and fail) on customers' Github forks and, (c) besides the scheduled runs it can also be manually triggered.
aws · Oct 16, 2020 · ddff369 · ddff369
1 parent 895372f
commit ddff369
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 29 deletions.
diff --git a/.github/workflows/v2-merge-forward.yml b/.github/workflows/v2-merge-forward.yml
diff --git a/scripts/merge-forward.sh b/scripts/merge-forward.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Forward merge 'master' branch into 'v2-main' branch
+
+set -exo pipefail
+
+git fetch --all
+git checkout -b v2-main origin/v2-main
+git merge origin/master --no-edit