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