Skip to content

[automated] Merge branch 'release/2.1' => 'release/2.2'#779

Merged
dagood merged 7 commits into
dotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2
Sep 19, 2018
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2'#779
dagood merged 7 commits into
dotnet:release/2.2from
dotnet-maestro-bot:merge/release/2.1-to-release/2.2

Conversation

@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor

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

This PR merges commits made on release/2.1 by the following committers:

Instructions for merging

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

merge button instructions

You can also do this on command line:

git checkout release/2.2
git pull
git fetch --force https://github.com/dotnet-maestro-bot/source-build merge/release/2.1-to-release/2.2:merge/release/2.1-to-release/2.2
git merge merge/release/2.1-to-release/2.2
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.

Maintainers of this repo have permission to the branch 'merge/release/2.1-to-release/2.2' on https://github.com/dotnet-maestro-bot/source-build.
You can push changes to this branch to resolve conflicts or other issues in this pull request. The bot will attempt
to update this branch as more changes are discovered on release/2.1.

Please 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.

crummel and others added 2 commits September 17, 2018 11:55
* Add binlogging where supported.

* Set working directory for RepoBuilds so logs get output correctly.
…ct.assets.json (dotnet#776)

* By default, continue on prebuilt baseline error

* Save all potential reports for more diagnosability

* Create zip with all project.assets.json files

* Set MSBUILDDEBUGPATH env var for all builds

Save contents in CI in case the outputs help troubleshooting.
@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

* Delete unused javascriptservices project

* Remove references to javascriptservices

* Update prebuilt baselines
@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

* Enable portable builds on linux

Most projects were already working fine. Only cli needed fixes to
support $(PortableBuild).

* Fix a couple more things with portable builds.
- OSX should not try to use the portable linux shared framework.
- Override target RID when portable to be correct from the start.  This allows us to pass it in everywhere and remove a couple workarounds.
@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

* Add portable builds to CI.

* Address code review feedback.

* Change to only do offline and tarball builds for portable since they require the online build anyway.

* Fix tarball and offline build names.

* Add PR jobs that can be triggered for portable testing.
@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

Add a simple project for linker, and use the built tool in CoreCLR and CoreFX.

Uses a patch to add "-h" arg and reflection heuristics feature.

Update baselines: removes ILLink.Tasks, adds additional versions of some existing packages.
@dotnet-maestro-bot
Copy link
Copy Markdown
Contributor Author

This pull request has been updated.

This PR merges commits made on release/2.1 by the following committers:

@dagood dagood self-assigned this Sep 19, 2018
# Conflicts:
#	repos/core-setup.proj
#	repos/templating.proj
#	tools-local/prebuilt-baseline-offline.xml
#	tools-local/prebuilt-baseline-online.xml
@dagood
Copy link
Copy Markdown
Member

dagood commented Sep 19, 2018

@dotnet-bot test OSX10.12 Release
java.nio.channels.ClosedChannelException

@dotnet-bot test Fedora24 Release
I think this is probably service failure:

    running restore
  Restoring packages for /mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/C#_classlib/C#_classlib.csproj...
  Failed to download package 'Microsoft.NETCore.Platforms.1.1.0' from 'https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg'.
  Response status code does not indicate success: 504 (Gateway Timeout).
  Failed to download package 'Microsoft.NETCore.Platforms.1.1.0' from 'https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg'.
  Response status code does not indicate success: 504 (Gateway Timeout).
/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/builtCli/sdk/2.2.100/NuGet.targets(114,5): error : Failed to download package 'Microsoft.NETCore.Platforms.1.1.0' from 'https://api.nuget.org/v3-flatcontainer/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg'. [/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/C#_classlib/C#_classlib.csproj]
/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/builtCli/sdk/2.2.100/NuGet.targets(114,5): error : Response status code does not indicate success: 504 (Gateway Timeout). [/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/C#_classlib/C#_classlib.csproj]
/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/builtCli/sdk/2.2.100/NuGet.targets(114,5): error : The feed 'nuget.org [https://api.nuget.org/v3/index.json]' lists package 'Microsoft.NETCore.Platforms.1.1.0' but multiple attempts to download the nupkg have failed. The feed is either invalid or required packages were removed while the current operation was in progress. Verify the package exists on the feed and try again. [/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/C#_classlib/C#_classlib.csproj]
/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/builtCli/sdk/2.2.100/NuGet.targets(114,5): error :   Unable to find package 'Microsoft.NETCore.Platforms.1.1.0'. [/mnt/resource/j/workspace/dotnet_source-build/release_2.2/Fedora24_Release_prtest/testing-smoke/C#_classlib/C#_classlib.csproj]

Heard about something similar at dotnet/coreclr#20047 (comment). Nothing on NuGet status page yet, and some of our other legs here passed anyway.


Side note: autoresolving the prebuilt baseline conflicts seems to have actually worked perfectly, wow.

@dagood
Copy link
Copy Markdown
Member

dagood commented Sep 19, 2018

Other legs hit the nuget restore issue too (didn't see them yet when I made the previous comment). Filed https://github.com/dotnet/core-eng/issues/4214 to track the problem.

@dagood
Copy link
Copy Markdown
Member

dagood commented Sep 19, 2018

@dotnet-bot test OSX10.12 Release
A little different than usual flakiness:

00:00:01.621 [WS-CLEANUP] Deleting project workspace...
00:00:01.831 java.io.IOException: Failed to mkdirs: /User/helix-runner/home/j/workspace/dotnet_source-build/release_2.2/OSX10.12_Release_prtest

@dagood
Copy link
Copy Markdown
Member

dagood commented Sep 19, 2018

Build/smoke-test worked on my local OSX on 89f122c, ignoring OSX leg in CI after retries repeatedly hit the same issue.

@dagood dagood merged commit 54879d5 into dotnet:release/2.2 Sep 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants