Backport changes from Ewan's fork#333
Merged
tmcgilchrist merged 3 commits intoocurrent:masterfrom Apr 20, 2022
Merged
Conversation
Currently in with_checkout, we use git reset --hard to move to the correct hash, but we don't move onto the correct branch at the same time. For builds that depend on the current branch (e.g. they record the branch into the build artifact) this behavior results in an incorrect build. Fix this by adding Cmd.git_checkout_force, which runs git checkout -f, and calling that from with_checkout before the git reset --hard. Signed-off-by: Ewan Mellor <ewan@tarides.com>
If the job uses sudo (e.g. a developer using "sudo docker") then the job will not be cancellable. In this case, we get EPERM from the kill call. Diagnose this with a more explicit message. Also, do not kill the main process in this case, but simply let the thread exit. Signed-off-by: Ewan Mellor <ewan@tarides.com>
This makes it easy to distinguish those boxes where the user can click through to get a build log. Signed-off-by: Ewan Mellor <ewan@tarides.com>
6416e36 to
ec66355
Compare
This was referenced Apr 20, 2022
This was referenced May 5, 2022
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The issue was addressed from ocurrent/ocaml-multicore-ci#19.
There are some commits from Ewan's fork https://github.com/ewanmellor/ocurrent which could be merge in OCurrent, it's all about cherry-ping them.