Skip to content

Commit

Permalink
Adding upmerge workflow
Browse files Browse the repository at this point in the history
Signed-off-by: willdavsmith <[email protected]>
  • Loading branch information
willdavsmith committed Apr 15, 2024
1 parent 48066a5 commit 5bd87e2
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }})
Expand All @@ -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

0 comments on commit 5bd87e2

Please sign in to comment.