From b55dbce97cb6ddf7bdd024bf2ac47ab50a4ad9e0 Mon Sep 17 00:00:00 2001 From: sk593 Date: Wed, 23 Oct 2024 13:27:55 -0700 Subject: [PATCH 1/2] fix upmerge Signed-off-by: sk593 --- .github/workflows/upmerge.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index fd724a92..b647ba63 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -62,7 +62,9 @@ jobs: export SOURCE_BRANCH=$(basename ${{ github.ref }}) echo "Upmerging samples from $SOURCE_BRANCH to edge" git fetch origin $SOURCE_BRANCH - git merge -m "Upmerge to edge" origin/$SOURCE_BRANCH + git merge --no-commit origin/$SOURCE_BRANCH + git checkout edge -- bicepconfig.json + git commit -m "Upmerge to edge" if git diff --quiet edge; then echo "No changes to merge from $SOURCE_BRANCH to edge" From c3ea62ef7b3ccf7201093ed7a38eed0fbb4da931 Mon Sep 17 00:00:00 2001 From: sk593 Date: Wed, 23 Oct 2024 14:59:25 -0700 Subject: [PATCH 2/2] add comment Signed-off-by: sk593 --- .github/workflows/upmerge.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index b647ba63..01676f70 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -57,6 +57,7 @@ jobs: # Merge changes from the github.ref branch, i.e., the branch from which the workflow is triggered. That # branch is assumed to be the current release branch, but could be any branch. # If there are no changes, stop the workflow. + # We ignore the bicepconfig.json file because we don't want to overwrite the version in the edge branch. - name: Upmerge samples run: | export SOURCE_BRANCH=$(basename ${{ github.ref }}) @@ -79,4 +80,4 @@ jobs: if: env.NO_CHANGES != 'true' env: GITHUB_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 + run: gh pr create --title "Upmerge to edge" --body "Upmerge to edge (kicked off by @${{ github.triggering_actor }})" --base edge --head $BRANCH_NAME \ No newline at end of file