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 758f28d commit bbca5f5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
token: ${{ secrets.GH_RAD_CI_BOT_PAT }}
ref: edge
# https://github.com/actions/checkout/issues/125#issuecomment-570254411
fetch-depth: 0
Expand All @@ -36,16 +35,17 @@ jobs:
# echo "Upmerging samples from $SOURCE_BRANCH to edge"
# git fetch origin $SOURCE_BRANCH
# git merge --no-commit origin/$SOURCE_BRANCH
# git commit -s -m "Upmerge to edge"
# git push --set-upstream origin $BRANCH_NAME
- name: Upmerge docs
run: |
export SOURCE_BRANCH=${{ inputs.version }}
git diff origin/$SOURCE_BRANCH
echo "Upmerging docs from $SOURCE_BRANCH to edge"
git fetch origin $SOURCE_BRANCH
git merge --no-commit origin/$SOURCE_BRANCH
git commit -m "Upmerge to edge"
git commit -s -m "Upmerge to edge"
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 $BRANCH_NAME
run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME

0 comments on commit bbca5f5

Please sign in to comment.