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

Move 6.0.0 rc.2 changes #5671

Merged
merged 3 commits into from Dec 12, 2017
Merged

Move 6.0.0 rc.2 changes #5671

merged 3 commits into from Dec 12, 2017

Conversation

daxian-dbw
Copy link
Member

@daxian-dbw daxian-dbw commented Dec 12, 2017

PR Summary

Merge PRs to 6.0.0-RC.2:
#5659
#5668
#5664

Note: For #5664, changes in tools/appveyor.psm1 are not moved to the 6.0.0 branch because:

  1. the change is to produce win-arm32/win-arm64 zip packages in daily builds.
    Since we don't have daily build for the 6.0.0 branch, the change is not needed.
  2. there are conflicts when cherry-picking the commit.

PR Checklist

Note: Please mark anything not applicable to this PR NA.

TravisEz13 and others added 2 commits December 11, 2017 16:30
…5659)

Added -skip-sudo-check, because the check fails in VSTS Hosted Linux Preview even though sudo works.
…r win-arm/win-arm64 (#5664)

Note: changes in tools/appveyor.psm1 are not moved to the 6.0.0 branch because:
   - the change is to produce win-arm32/win-arm64 zip packages in daily builds.
     Since we don't have daily build for the 6.0.0 branch, the change is not needed.
   - there are conflicts when cherry-picking the commits
@daxian-dbw daxian-dbw merged commit f11b9ed into 6.0.0 Dec 12, 2017
@daxian-dbw daxian-dbw deleted the move_6.0.0-rc.2_changes branch December 12, 2017 04:47
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.

None yet

3 participants