Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/8.0-rc1' => 'release/8.0' #90749

Conversation

dotnet-maestro-bot
Copy link
Contributor

I detected changes in the release/8.0-rc1 branch which have not been merged yet to release/8.0. I'm a robot and am configured to help you automatically keep release/8.0 up to date, so I've opened this PR.

This PR merges commits made on release/8.0-rc1 by the following committers:

  • github-actions[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-rc1-to-release/8.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

@ghost
Copy link

ghost commented Aug 17, 2023

Tagging subscribers to this area: @dotnet/area-infrastructure-libraries
See info in area-owners.md if you want to be subscribed.

Issue Details

I detected changes in the release/8.0-rc1 branch which have not been merged yet to release/8.0. I'm a robot and am configured to help you automatically keep release/8.0 up to date, so I've opened this PR.

This PR merges commits made on release/8.0-rc1 by the following committers:

  • github-actions[bot]

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/8.0-rc1
git pull --ff-only
git checkout release/8.0
git pull --ff-only
git merge --no-ff release/8.0-rc1

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/8.0-rc1-to-release/8.0'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0
or if you are using SSH
git checkout -b merge/release/8.0-rc1-to-release/8.0 release/8.0
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/8.0-rc1-to-release/8.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/8.0-rc1-to-release/8.0

Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

Author: dotnet-maestro-bot
Assignees: -
Labels:

area-Infrastructure-libraries

Milestone: -

mmitche and others added 4 commits August 17, 2023 10:02
…otnet#90748)

.. because `dotnet-install --channel 8.0` is returning 9.0-alpha sdks right now.

Co-authored-by: Ankit Jain <[email protected]>
…in config binder gen (dotnet#90746)

* Improve filtering of candidate binding invocations in config binder gen

* Address feedback

* Address feedback: rename helper; further tighten constraint

* Add follow-up TODO

* Revert TypeSyntax clause to fix failing tests

---------

Co-authored-by: Layomi Akinrinade <[email protected]>
…0049)" (dotnet#90696)

This reverts commit eacb32e.
Need to investigate changes because they caused a test failure.
@carlossanlop carlossanlop merged commit 3ad2a82 into dotnet:release/8.0 Aug 18, 2023
342 of 387 checks passed
@ericstj
Copy link
Member

ericstj commented Aug 18, 2023

@mmitche @wtgodbe - any idea why the bot made this PR from a branch that didn't actually merge into the release/8.0? As a result it looks like the validation badges point at the rolling builds from the RC branch. This is bad since it means we aren't testing merged bits.

@mmitche
Copy link
Member

mmitche commented Aug 21, 2023

@ericstj I'm not following. The validation badges (GitHub status checks) are based on the source-sha of the input PR branch.

@ericstj
Copy link
Member

ericstj commented Aug 25, 2023

Right, and the bot created that PR branch. Since it created it as just a point in the history of the RC1 branch there were existing builds that satisfied the badges. As a result this PR didn't get any testing as a merge into 8.0. It should be creating the branch with an actual merge into the target branch so that it won't reuse rolling build results.

@ghost ghost locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants