From 5bd87e22dfc4f1914765f64beb6112754d2381f4 Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Mon, 15 Apr 2024 15:02:03 -0700 Subject: [PATCH] Adding upmerge workflow Signed-off-by: willdavsmith --- .github/workflows/upmerge.yaml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index 59f0d64a9..322f6c4b5 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -27,7 +27,8 @@ jobs: run: | export DATE=$(date +%Y-%m-%d) export RAND=$(openssl rand -hex 2) - git checkout -b upmerge/$DATE-$RAND + echo "BRANCH_NAME=upmerge/$DATE-$RAND" + git checkout -b upmerge/$BRANCH_NAME # - name: Upmerge docs # run: | # export SOURCE_BRANCH=$(basename ${{ github.ref }}) @@ -41,11 +42,9 @@ jobs: echo "Upmerging docs from $SOURCE_BRANCH to edge" git fetch origin $SOURCE_BRANCH git merge --no-commit origin/$SOURCE_BRANCH - - name: Commit changes - run: | git commit -m "Upmerge to edge" - git push --set-upstream origin upmerge/$DATE + git push --set-upstream origin $BRANCH_NAME - name: Create pull request env: GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT}} - run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge" --base edge --head upmerge/$DATE + run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge" --base edge --head $BRANCH_NAME