Add merge-upstream command

opf · Sep 14, 2023 · 20b9b93 · 20b9b93
1 parent 485ea78
commit 20b9b93
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/script/merge-upstream b/script/merge-upstream
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+
+COMMIT=${1?"Usage: $0 <Upstream commit> <optional sed command>"}
+SED=${2:-sed}
+
+git config remote.upstream.url || git remote add upstream [email protected]:primer/view_components.git
+git fetch upstream
+
+git checkout main
+git branch -D bump/primer-upstream &>/dev/null || true  
+git branch -D bump/primer-upstream-ref &>/dev/null || true  
+
+git checkout -b bump/primer-upstream-ref
+git reset --hard $COMMIT
+
+git checkout -b bump/primer-upstream
+git merge bump/primer-upstream-ref || true
+
+find .changeset/ -name "*.md" -exec $SED -i "s/\@primer\/view-components/\@openproject\/primer-view-components/g" {} +