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/7.0-rc1' => 'release/7.0' #74692

Conversation

dotnet-maestro-bot
Copy link
Contributor

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

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

  • lambdageek
  • 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/7.0-rc1
git pull --ff-only
git checkout release/7.0
git pull --ff-only
git merge --no-ff release/7.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/7.0-rc1-to-release/7.0
or if you are using SSH
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.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/7.0-rc1-to-release/7.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/7.0-rc1-to-release/7.0 release/7.0
git pull https://github.com/dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.0
or if you are using SSH
git checkout -b merge/release/7.0-rc1-to-release/7.0 release/7.0
git pull [email protected]:dotnet-maestro-bot/runtime merge/release/7.0-rc1-to-release/7.0
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet-maestro-bot/runtime HEAD:merge/release/7.0-rc1-to-release/7.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.

github-actions bot and others added 2 commits August 25, 2022 13:07
System.Runtime.Serialization.Schema isn't getting a NuGet package created for it because it doesn't set IsPackable=true.

Co-authored-by: Eric Erhardt <[email protected]>
@dotnet-issue-labeler
Copy link

I couldn't figure out the best area label to add to this PR. If you have write-permissions please help me learn by adding exactly one area label.

@carlossanlop
Copy link
Member

This should be the last "release/7.0-rc-1 -> release/7.0" merge commit backport.

It includes only two changes, but there are a lot of CI failures.

@lambdageek @dalexsoto @naricc @lewing do you see any concerning failures related to #74675 ?

@eerhardt @StephenMolloy @HongGit do you se any concerning failures related to #74597 ?

@radical
Copy link
Member

radical commented Aug 29, 2022

/azp run runtime-wasm

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@eerhardt
Copy link
Member

do you se any concerning failures related to #74597 ?

No. All the failures look like Helix infra issues. At least the ones that I checked.

@carlossanlop
Copy link
Member

Ping @lambdageek @dalexsoto @naricc @lewing do you see any concerning failures related to #74675 ?

@akoeplinger
Copy link
Member

/azp run runtime-extra-platforms

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@naricc
Copy link
Contributor

naricc commented Aug 30, 2022

I don't see anything wrong with this, but I was not able to view the helix logs for some of the failures, which I think is an infrastructure issue. I want to re-run them to make sure.

@lewing
Copy link
Member

lewing commented Aug 30, 2022

Console log: 'Common.Tests' from job 81e6a022-9fe2-477e-b696-cab7d84ec7c3 workitem 459bd1c2-0007-4d9f-bc3e-e5dee24b8271 (windows.11.amd64.client.open.svc) executed on machine a0008Q6 running Windows-10-10.0.22000-SP0

C:\h\w\AC6B09B4\w\AEE809A0\e>taskkill.exe /f /im corerun.exe 
ERROR: The process "corerun.exe" not found.

C:\h\w\AC6B09B4\w\AEE809A0\e>call RunTests.cmd --runtime-path C:\h\w\AC6B09B4\p 
----- start Tue 08/30/2022 15:00:46.20 ===============  To repro directly: ===================================================== 
pushd C:\h\w\AC6B09B4\w\AEE809A0\e\
"C:\h\w\AC6B09B4\p\dotnet.exe" exec --runtimeconfig Common.Tests.runtimeconfig.json --depsfile Common.Tests.deps.json xunit.console.dll Common.Tests.dll -xml testResults.xml -nologo -nocolor -trait category=OuterLoop -notrait category=IgnoreForCI -notrait category=failing 
popd
===========================================================================================================

C:\h\w\AC6B09B4\w\AEE809A0\e>"C:\h\w\AC6B09B4\p\dotnet.exe" exec --runtimeconfig Common.Tests.runtimeconfig.json --depsfile Common.Tests.deps.json xunit.console.dll Common.Tests.dll -xml testResults.xml -nologo -nocolor -trait category=OuterLoop -notrait category=IgnoreForCI -notrait category=failing  
'"C:\h\w\AC6B09B4\p\dotnet.exe"' is not recognized as an internal or external command,
operable program or batch file.
----- end Tue 08/30/2022 15:00:46.20 ----- exit code 9009 ----------------------------------------------------------
2022-08-30T15:00:46.965Z	INFO   	run.py	run(48)	main	Beginning reading of test results.
2022-08-30T15:00:46.965Z	INFO   	run.py	__init__(42)	read_results	Searching 'C:\h\w\AC6B09B4\w\AEE809A0\e' for test results files
2022-08-30T15:00:46.981Z	INFO   	run.py	__init__(42)	read_results	Searching 'C:\h\w\AC6B09B4\w\AEE809A0\uploads' for test results files
2022-08-30T15:00:46.981Z	WARNING	run.py	__init__(55)	read_results	No results file found in any of the following formats: xunit, junit, trx
2022-08-30T15:00:46.981Z	INFO   	run.py	packing_test_reporter(30)	report_results	Packing 0 test reports to 'C:\h\w\AC6B09B4\w\AEE809A0\e\__test_report.json'
2022-08-30T15:00:46.981Z	INFO   	run.py	packing_test_reporter(33)	report_results	Packed 1394 bytes
['Common.Tests' END OF WORK ITEM LOG: Command exited with 9009]

@akoeplinger
Copy link
Member

The failures e.g. on runtime-coreclr outerloop don't look related either.

@lewing
Copy link
Member

lewing commented Aug 30, 2022

the runtime-extra-platforms (Build Browser wasm windows Release LibraryTests) failure is #73721

@carlossanlop
Copy link
Member

Thanks everyone for checking. Merging now.

@carlossanlop
Copy link
Member

And we will keep an eye on the release/7.0 CI.

@carlossanlop carlossanlop merged commit c37531f into dotnet:release/7.0 Aug 30, 2022
@ghost ghost locked as resolved and limited conversation to collaborators Sep 30, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants