Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Bump msbuild to track xplat-master #10339

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.

Sign up for GitHub

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

Jump to bottom
Merged
akoeplinger merged 1 commit into from
Oct 5, 2018
Merged

Bump msbuild to track xplat-master #10339

akoeplinger merged 1 commit into from
Oct 5, 2018

Conversation

@radical
Copy link
Member

@radical radical commented Aug 28, 2018

No description provided.

@radical radical requested a review from akoeplinger August 28, 2018 20:00
@akoeplinger
Copy link
Member

akoeplinger commented Aug 29, 2018

@monojenkins build OS X Extended

@radical radical force-pushed the bump_msbuild_master branch from fe49613 to cea321c Compare August 30, 2018 09:51
@radical
Copy link
Member Author

radical commented Aug 30, 2018

@monojenkins build OS X Extended

@akoeplinger
Copy link
Member

akoeplinger commented Aug 30, 2018

please backport to 2018-08 too once we're good with this

@radical
Copy link
Member Author

radical commented Sep 6, 2018

@monojenkins build OS X Extended

@radical radical force-pushed the bump_msbuild_master branch from cea321c to c02d385 Compare September 6, 2018 18:56
@radical radical requested a review from alexischr as a code owner September 6, 2018 18:56
@radical
Copy link
Member Author

radical commented Sep 6, 2018

Fixed build script.

@radical
Copy link
Member Author

radical commented Sep 6, 2018

@monojenkins build OS X Extended

@radical radical force-pushed the bump_msbuild_master branch from c02d385 to 41ce039 Compare September 7, 2018 15:15
@radical
Copy link
Member Author

radical commented Sep 7, 2018

@monojenkins build OS X Extended

@akoeplinger
Copy link
Member

akoeplinger commented Sep 7, 2018

There's XUnit : error : Tests failed on platforms: net471|x86 [/Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/external/bockbuild/builds/msbuild-15/src/Build.UnitTests/Microsoft.Build.Engine.UnitTests.csproj] on the msbuild tests.

@radical
Copy link
Member Author

radical commented Sep 11, 2018

tests failing, first issue: #10544

@radical
Copy link
Member Author

radical commented Sep 11, 2018

second issue: #10555

@radical radical force-pushed the bump_msbuild_master branch from 41ce039 to be66305 Compare September 18, 2018 14:07
@radical
Copy link
Member Author

radical commented Sep 18, 2018

@monojenkins build OS X Extended

@radical
Copy link
Member Author

radical commented Sep 19, 2018 

03:20:29 /Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/scripts/ci/babysitter: Command `make` timed out
03:20:29 /Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/scripts/ci/babysitter: Saw timeout in test case None (never allowed). Will halt testing.
03:20:29 *** end(14401): runtime-tests-llvm: \e[43mUnstable\e[0m

@akoeplinger mono crashes and timeouts, is this a known issue?

@radical radical force-pushed the bump_msbuild_master branch from be66305 to c9dedf3 Compare September 20, 2018 19:33
@radical
Copy link
Member Author

radical commented Sep 20, 2018

Rebased on master again!

@monojenkins build OS X Extended

@radical
Copy link
Member Author

radical commented Sep 21, 2018 •
edited
Loading

Timeout:

21:13:16 msbuild->do_build:
21:13:16 	Building (arch: darwin-64)
00:35:11 /Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/scripts/ci/babysitter: Command `/Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/scripts/mac-sdk-package.sh` timed out
00:35:11 /Users/builder/jenkins/workspace/test-mono-pull-request-mac-sdk/scripts/ci/babysitter: Saw timeout in test case None (never allowed). Will halt testing.
00:35:11 *** end(18000): bockbuild: \e[41mFailed\e[0m

@akoeplinger
Copy link
Member

akoeplinger commented Sep 24, 2018

@akoeplinger mono crashes and timeouts, is this a known issue?

Nothing I'm aware of.

@radical radical force-pushed the bump_msbuild_master branch from c9dedf3 to 87568e4 Compare September 26, 2018 05:46
@radical
Copy link
Member Author

radical commented Sep 26, 2018

@monojenkins build OS X Extended

@marek-safar
Copy link
Member

marek-safar commented Sep 27, 2018

@monojenkins backport 2018-08

@marek-safar
Copy link
Member

marek-safar commented Sep 27, 2018

@monojenkins backport 2018-06

@monojenkins monojenkins mentioned this pull request Sep 27, 2018
Closed
@monojenkins
Copy link
Contributor

monojenkins commented Sep 27, 2018

@marek-safar backporting to 2018-06 failed, the patch results in conflicts:

Applying: Bump msbuild to track xplat-master
Using index info to reconstruct a base tree...
M	packaging/MacSDK/msbuild.py
M	scripts/ci/run-test-mac-sdk.sh
Falling back to patching base and 3-way merge...
Auto-merging packaging/MacSDK/msbuild.py
CONFLICT (content): Merge conflict in packaging/MacSDK/msbuild.py
error: Failed to merge in the changes.
Patch failed at 0001 Bump msbuild to track xplat-master

Please backport manually!

@radical radical mentioned this pull request Sep 27, 2018
Closed
@radical
Copy link
Member Author

radical commented Sep 27, 2018

Waiting on #10863 .

@akoeplinger
Copy link
Member

akoeplinger commented Sep 28, 2018

@radical hmm I merged #10668 (comment) before I saw #10863, do you think it'll cause frequent hangs in the 2018-08 branch?

@radical
Copy link
Member Author

radical commented Sep 28, 2018

@akoeplinger @lambdageek confirmed that the GC issue affects 2018-08 too, so yeah, I think it might cause occasional hangs :/

@akoeplinger
Copy link
Member

akoeplinger commented Oct 2, 2018

The PR which fixes the hang was merged so let's try another build.

@monojenkins build OS X Extended

@radical radical force-pushed the bump_msbuild_master branch from 87568e4 to 8132dbc Compare October 2, 2018 22:20
@radical
Copy link
Member Author

radical commented Oct 2, 2018

Rebased the branch to get the fix.

@monojenkins build OS X Extended

@akoeplinger
Copy link
Member

akoeplinger commented Oct 2, 2018

@monojenkins build OS X Extended

@radical
Copy link
Member Author

radical commented Oct 3, 2018

5 test failures, but those should have been fixed on mono/master. Investigating.

@radical radical mentioned this pull request Oct 3, 2018
Closed
@radical
Copy link
Member Author

radical commented Oct 3, 2018

Tests are failing due to #10951 .

@radical radical force-pushed the bump_msbuild_master branch from 8132dbc to 29d3fc8 Compare October 5, 2018 00:36
@radical
Copy link
Member Author

radical commented Oct 5, 2018

Rebased to get the fix for #10951 .

@monojenkins build OS X Extended

@radical
Copy link
Member Author

radical commented Oct 5, 2018

@monojenkins build OS X Extended

@radical
Copy link
Member Author

radical commented Oct 5, 2018

Finally, all the msbuild tests pass! @akoeplinger could you please merge this?

@akoeplinger
Copy link
Member

akoeplinger commented Oct 5, 2018

yay 🎉

@akoeplinger akoeplinger merged commit 2fbfadb into mono:master Oct 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@akoeplinger akoeplinger Awaiting requested review from akoeplinger

@alexischr alexischr Awaiting requested review from alexischr

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@radical @akoeplinger @marek-safar @monojenkins