This repository was archived by the owner on Jan 7, 2022. It is now read-only.
Temporary fix for CI #163
Merged
Temporary fix for CI #163
Conversation
This file contains hidden or 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
ltratt
reviewed
Jan 5, 2021
.buildbot.sh
Outdated
| @@ -27,7 +28,12 @@ ulimit -d $((1024 * 1024 * 10)) # 10 GiB | |||
|
|
|||
| # Build extended tools and install into TARBALL_TOPDIR. | |||
| mkdir -p ${TARBALL_TOPDIR} | |||
| /usr/bin/time -v ./x.py install --config .buildbot.config.toml | |||
| # We should be able to do this, but `x.py install` is broken. | |||
There was a problem hiding this comment.
What does "this" refer to here? [I eventually guessed, but it's a bit ambiguous.]
There was a problem hiding this comment.
The following commented line. We can add some whitespace to make it more obvious?
There was a problem hiding this comment.
It'll still be ambiguous I suspect: I think the comment needs rephrasing.
ltratt
reviewed
Jan 5, 2021
.buildbot.sh
Outdated
| @@ -28,7 +28,7 @@ ulimit -d $((1024 * 1024 * 10)) # 10 GiB | |||
|
|
|||
| # Build extended tools and install into TARBALL_TOPDIR. | |||
| mkdir -p ${TARBALL_TOPDIR} | |||
| # We should be able to do this, but `x.py install` is broken. | |||
| # `x.py install` currently broken, so we use a workaround for now. | |||
|
Please squash. |
This gets us going, but installs too many intermediate libraries. Once upstream fixes `x.py install` we should revert to using it.
|
Splat. |
|
Hold on a minute. I think there's a bug in the second commit. |
|
Sorry, that's rubbish, please carry on :) |
|
bors r+ |
|
Build succeeded: |
vext01
added a commit
to vext01/ykrustc
that referenced
this pull request
Jan 13, 2021
Upstream has fixed `x.py install` so we can go back to using it.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
x.py installseems to be broken at the moment and this in turn broke our CI. This branch proposes a workaround.The first commit is the best "easy" fix I can come up with. I'd like this to be a temporary workaround, as it's not optimal: copying the stage 2 dir copies a lot more stuff than you'd find in a typical sysroot. We could try and remove the bits we don't need, but it's difficult to know what, and we'd have to keep it in sync with upstream. I'm hoping upstream will fix
x.pyinstall soon...Tested on ykjit/yk#206. And here is the forced build log.
The second commit allows us to run
.buildbot.shin scenarios where there isn't necessarily a bors merge commit on the top of the branch (i.e. during a manual or forced build). I needed this to test my changes and it seems generally useful.