From 18aeb2be38b8a91c357a24abe13ca60b01c8c5f6 Mon Sep 17 00:00:00 2001 From: willdavsmith Date: Mon, 15 Apr 2024 15:24:25 -0700 Subject: [PATCH] Adding upmerge workflow Signed-off-by: willdavsmith --- .github/workflows/upmerge.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index 9850850a1..4e7b83a26 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -35,6 +35,7 @@ jobs: # git merge --no-commit origin/$SOURCE_BRANCH # git commit -m "Upmerge to edge" # git push --set-upstream origin $BRANCH_NAME + # git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html - name: Upmerge docs run: | export SOURCE_BRANCH=${{ inputs.version }} @@ -43,6 +44,7 @@ jobs: git merge --no-commit origin/$SOURCE_BRANCH git commit -m "Upmerge to edge" git push --set-upstream origin $BRANCH_NAME + git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html - name: Create pull request env: GITHUB_TOKEN: ${{ secrets.GH_RAD_CI_BOT_PAT}}