Adding upmerge workflow (#1106)

* Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * Adding upmerge workflow Signed-off-by: willdavsmith <[email protected]> * PR Signed-off-by: willdavsmith <[email protected]> --------- Signed-off-by: willdavsmith <[email protected]>
radius-project · Apr 16, 2024 · e7b6a64 · e7b6a64
1 parent 728f728
commit e7b6a64
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml
@@ -5,32 +5,34 @@ on:
 
 jobs:
   upmerge:
+    name: Upmerge docs to edge
     runs-on: ubuntu-latest
     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
       - name: Configure git
         run: |
           git config --global user.email "[email protected]"
           git config --global user.name "Radius CI Bot"
       - name: Create new branch
         run: |
-          export DATE=$(date +%Y-%m-%d) >> $GITHUB_ENV
-          git checkout -b upmerge/$DATE
+          export DATE=$(date +%Y-%m-%d)
+          export RAND=$(openssl rand -hex 2)
+          echo "BRANCH_NAME=upmerge/$DATE-$RAND" >> $GITHUB_ENV
+          git checkout -b upmerge/$DATE-$RAND
       - name: Upmerge docs
         run: |
           export SOURCE_BRANCH=$(basename ${{ github.ref }})
           echo "Upmerging docs from $SOURCE_BRANCH to edge"
           git fetch origin $SOURCE_BRANCH
           git merge --no-commit origin/$SOURCE_BRANCH
           git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html
-      - 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 (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME