From 5b079df2fb749f61a8328d3a2244ab8bb2b1b504 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:19:57 -0700 Subject: [PATCH 01/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index e1a26ca10ba..cf66224ce82 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -52,7 +52,7 @@ jobs: auth_token: ${{ secrets.GITHUB_TOKEN }} sync-code: - if: github.repository == 'dotnet/dotnet-monitor' + # if: github.repository == 'dotnet/dotnet-monitor' strategy: matrix: branch: ["feature/9.x"] @@ -76,12 +76,22 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" # Activate the ours merge driver to respect any branch specific files git config merge.ours.driver true - git merge "$base_branch" --strategy=ort --strategy-option=theirs + MERGE_RESULT=0 + # Don't fail if the automatic merge fails, we'll try to handle it later + git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? + # If the merge failed, try to restore all the branch specific files in the case of a modify/delete conflict. + # If the merge succeeded, we still do this to ensure that we discard any new files from the base branch if they exist in our branch-specific folders. matches=$(perl -ne '/^([^\s]+)\s+merge=ours/gm && print "$1 "' .gitattributes) for match in $matches; do git checkout --no-overlay "$target_branch" -- "$match" done + + # If the merge failed, try to continue it now that we've restored the branch specific files + # If it still fails, human intervention is required + if [ MERGE_RESULT -ne 0 ]; then + git merge --continue + fi env: target_branch: origin/${{ matrix.branch }} From da50ca16897bf73a4f8691c5139a2640803440d4 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:34:08 -0700 Subject: [PATCH 02/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index cf66224ce82..8365d726666 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -72,6 +72,8 @@ jobs: - name: Sync branch run: | + ourFiles=$(perl -ne '/^([^\s]+)\s+merge=ours/gm && print "$1 "' .gitattributes) + git config user.name "github-actions[bot]" git config user.email "41898282+github-actions[bot]@users.noreply.github.com" # Activate the ours merge driver to respect any branch specific files @@ -80,18 +82,17 @@ jobs: # Don't fail if the automatic merge fails, we'll try to handle it later git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? - # If the merge failed, try to restore all the branch specific files in the case of a modify/delete conflict. - # If the merge succeeded, we still do this to ensure that we discard any new files from the base branch if they exist in our branch-specific folders. - matches=$(perl -ne '/^([^\s]+)\s+merge=ours/gm && print "$1 "' .gitattributes) - for match in $matches; do - git checkout --no-overlay "$target_branch" -- "$match" - done - - # If the merge failed, try to continue it now that we've restored the branch specific files - # If it still fails, human intervention is required + # If the merge failed it's likely do a (modify/delete) conflict. Try to auto-resolve it by accepting the results if [ MERGE_RESULT -ne 0 ]; then + for match in $ourFiles; do + git add -- "$match" + done git merge --continue fi + + for match in $ourFiles; do + git checkout --no-overlay "$target_branch" -- "$match" + done env: target_branch: origin/${{ matrix.branch }} From 8fb42175777f0ee04fdb3df1c3cf8463e8639d4d Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:35:03 -0700 Subject: [PATCH 03/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 8365d726666..ef968c4745f 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -83,7 +83,7 @@ jobs: git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? # If the merge failed it's likely do a (modify/delete) conflict. Try to auto-resolve it by accepting the results - if [ MERGE_RESULT -ne 0 ]; then + if [ $MERGE_RESULT -ne 0 ]; then for match in $ourFiles; do git add -- "$match" done From 5400fe1c5b2ca5d150f98c5a29df90e91a19271b Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:36:37 -0700 Subject: [PATCH 04/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index ef968c4745f..73b90602401 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -87,7 +87,7 @@ jobs: for match in $ourFiles; do git add -- "$match" done - git merge --continue + git merge --continue --no-edit fi for match in $ourFiles; do From 8a46f5157eab3bc9808772a30f0d9633f279bf12 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:37:23 -0700 Subject: [PATCH 05/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 73b90602401..5d7545b4db1 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -87,7 +87,7 @@ jobs: for match in $ourFiles; do git add -- "$match" done - git merge --continue --no-edit + git merge --no-edit --continue fi for match in $ourFiles; do From 3781d2bc8cf6b0043efa125ff96e017e80c8a0b4 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:38:39 -0700 Subject: [PATCH 06/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 5d7545b4db1..d5b7395bc45 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -80,14 +80,14 @@ jobs: git config merge.ours.driver true MERGE_RESULT=0 # Don't fail if the automatic merge fails, we'll try to handle it later - git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? + git merge "$base_branch" --no-edit --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? # If the merge failed it's likely do a (modify/delete) conflict. Try to auto-resolve it by accepting the results if [ $MERGE_RESULT -ne 0 ]; then for match in $ourFiles; do git add -- "$match" done - git merge --no-edit --continue + git merge --continue fi for match in $ourFiles; do From c00884e8da64f541b0e7a68104c2e049b27dd435 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:41:55 -0700 Subject: [PATCH 07/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index d5b7395bc45..99544129920 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -80,14 +80,14 @@ jobs: git config merge.ours.driver true MERGE_RESULT=0 # Don't fail if the automatic merge fails, we'll try to handle it later - git merge "$base_branch" --no-edit --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? + git merge "$base_branch" --strategy=ort --strategy-option=theirs || MERGE_RESULT=$? # If the merge failed it's likely do a (modify/delete) conflict. Try to auto-resolve it by accepting the results if [ $MERGE_RESULT -ne 0 ]; then for match in $ourFiles; do git add -- "$match" done - git merge --continue + GIT_MERGE_AUTOEDIT=no git merge --continue fi for match in $ourFiles; do From ee29e59042d27d423a10537437f6051d698b078a Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:43:03 -0700 Subject: [PATCH 08/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 99544129920..d67b2e05cb5 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -87,7 +87,7 @@ jobs: for match in $ourFiles; do git add -- "$match" done - GIT_MERGE_AUTOEDIT=no git merge --continue + git merge --continue -m "Merge $base_branch into $target_branch with manual resolution" fi for match in $ourFiles; do From fef25aa945404b95dc75468610c0f84682f72fdc Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:44:29 -0700 Subject: [PATCH 09/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index d67b2e05cb5..3d2ee9cd54b 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -87,7 +87,7 @@ jobs: for match in $ourFiles; do git add -- "$match" done - git merge --continue -m "Merge $base_branch into $target_branch with manual resolution" + GIT_EDITOR=/bin/true git merge --continue fi for match in $ourFiles; do From 7097d26dd3a243de185962a66870a94007516446 Mon Sep 17 00:00:00 2001 From: Joe Schmitt <1146681+schmittjoseph@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:45:12 -0700 Subject: [PATCH 10/11] Update sync-branches.yml --- .github/workflows/sync-branches.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/sync-branches.yml b/.github/workflows/sync-branches.yml index 3d2ee9cd54b..741499aa323 100644 --- a/.github/workflows/sync-branches.yml +++ b/.github/workflows/sync-branches.yml @@ -87,7 +87,8 @@ jobs: for match in $ourFiles; do git add -- "$match" done - GIT_EDITOR=/bin/true git merge --continue + git commit --no-edit + #GIT_EDITOR=/bin/true git merge --continue fi for match in $ourFiles; do From 5cf53e48ae9ffb697d8a39e73a65a18e851090c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 22:40:02 +0000 Subject: [PATCH 11/11] [main] Bump Swashbuckle.AspNetCore in /eng/dependabot/independent Bumps [Swashbuckle.AspNetCore](https://github.com/domaindrivendev/Swashbuckle.AspNetCore) from 6.6.2 to 6.7.1. - [Release notes](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/releases) - [Commits](https://github.com/domaindrivendev/Swashbuckle.AspNetCore/compare/v6.6.2...v6.7.1) --- updated-dependencies: - dependency-name: Swashbuckle.AspNetCore dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- eng/dependabot/independent/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 19c32336d2c..d0534e47a20 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -13,7 +13,7 @@ 13.0.3 11.0.0 - 6.6.2 + 6.7.1 3.7.305.7 3.7.300.33