From 4a3087f1d39504f7ef9b05974f686087d726a8a3 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Feb 28 2022 18:07:41 +0000 Subject: Create a FB specific release branch Let's create two branches, one for the entirety of the hyperscale sig and one for facebook specific backports. --- diff --git a/create_or_checkout_release_branch.sh b/create_or_checkout_release_branch.sh index c9a0b8a..a079e06 100755 --- a/create_or_checkout_release_branch.sh +++ b/create_or_checkout_release_branch.sh @@ -24,6 +24,7 @@ fi VERSION="$1" UPSTREAM_TAG="v$VERSION" HS_RELEASE_BRANCH="hs-v$VERSION" +FB_RELEASE_BRANCH="hs+fb-v$VERSION" HS_BASE_RELEASE_COMMIT_TITLE="hs-systemd v$VERSION release base" # Fetch all the branches, update the existing, and make sure there is not an @@ -52,7 +53,11 @@ git checkout "$UPSTREAM_TAG" -b "$HS_RELEASE_BRANCH" # Placeholder commit to mark where the Hyperscale patches start git commit --allow-empty -m "$HS_BASE_RELEASE_COMMIT_TITLE" -# Push it out so everyone has the release branch! +# Create the release branch for FB specific backports +git checkout "$HS_RELEASE_BRANCH" -b "$FB_RELEASE_BRANCH" + +# Push the branches out so everyone has them! git push --set-upstream origin "$HS_RELEASE_BRANCH" +git push --set-upstream origin "$FB_RELEASE_BRANCH" -echo "Release branch $HS_RELEASE_BRANCH is ready! You can cherry-pick and apply patches now." +echo "Release branches $HS_RELEASE_BRANCH and $FB_RELEASE_BRANCH are ready! You can cherry-pick and apply patches now."