Fix merge conflict #1
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change groups the various sls files that set up the Servo build environment into a single folder to: - make their purpose more clear in the top.sls file - make it easier to add auxiliary files (i.e. map.jinja)
Use a SHA512 hash instead of a SHA1 hash to verify the B2G download. Update the style guide.
Use separate directories for separate versions of the SDK, NDK, and toolchain, and use symlinks to point to the current versions. This is more robust for a few reasons: - Partially-completed upgrades to new versions won't touch existing versions on the disk - The symlinks aren't updated until the respective new version is completely installed, allowing for more transactional updates. - The symlinks also allow for constant paths in the bash_profile file and the buildbot config, which means less moving parts to break. In particular, the relevant buildbot config is on the master, and using symlinks makes it unnecessary to use Salt orchestration to gate changes to the master buildbot config on changes on the cross builders. Ideally, these states would also use file.directory with clean: True to clean out old versions of the SDK, NDK, and toolchain, but I wasn't able to get this working properly yet (the just-downloaded files would keep getting cleaned away). This also eliminates our use of cmd.wait, which was recently put on the deprecation path in Salt, and replaces it with cmd.run + creates: True.
The buildbot configuration already sets the correct environment variables for Android builds, so it's unnecessary to set them via .bash_profile.
Don't install the servo build dependencies on the Buildbot master, but make sure to keep git installed to update the Salt file tree.
archive.extracted is fairly loud because each extracted file is listed both in INFO log level output and the highstate summary. This gets around exceeding Travis's 4MB log length limit.
Landing servo#250 added salt.common to base in top.sls
aneeshusa
force-pushed
the
android-refactor
branch
from
d3114e6
to
1c21ea7
Compare
|
Did a rebase instead, see servo#263 (comment). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I accidentally broke servo#263 by landing servo#250 .