Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upmerge to edge #1279

Merged
merged 11 commits into from
Nov 12, 2024
Prev Previous commit
Next Next commit
Fix GitHub auth login for upmerge workflow (#1278)
* Adding GH_TOKEN

Signed-off-by: willdavsmith <willdavsmith@gmail.com>

* Adding Signoff

Signed-off-by: willdavsmith <willdavsmith@gmail.com>

* Removing Signoff

Signed-off-by: willdavsmith <willdavsmith@gmail.com>

---------

Signed-off-by: willdavsmith <willdavsmith@gmail.com>
willdavsmith authored Nov 12, 2024
commit f80d912f7370fe55b0e1568fe966544e092237a1
7 changes: 6 additions & 1 deletion .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
@@ -39,12 +39,15 @@ jobs:
ref: edge
# https://github.com/actions/checkout/issues/125#issuecomment-570254411
fetch-depth: 0
persist-credentials: false

- name: Configure git
env:
GH_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }}
run: |
git config --global user.email "radiuscoreteam@service.microsoft.com"
git config --global user.name "Radius CI Bot"
gh auth login --with-token <<< "${{ secrets.GH_RAD_CI_BOT_PAT }}"
git remote set-url origin https://$GH_TOKEN@github.com/${{ github.repository }}

# Create a new branch from edge. This branch will be used to PR back into edge.
- name: Create new branch
@@ -78,4 +81,6 @@ jobs:
# Create a PR from the new branch to edge
- name: Create pull request
if: env.NO_CHANGES != 'true'
env:
GH_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT }}
run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME