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

travis: Split all dist builders in two #40998

Merged
merged 1 commit into from
Apr 4, 2017

Conversation

alexcrichton
Copy link
Member

Previously we would use one builder on Travis to produce two sets of host
compilers for two different targets. Unfortunately though we've recently
increased how much we're building for each target so this is starting to take
unnecessarily long (#40804). This commit splits the dist builders in two by
ensuring that we only dist one target on each builder, which should take a much
shorter amount of time. This should also unblock other work such as landing the
RLS (#40584).

@rust-highfive
Copy link
Collaborator

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

r? @brson

@@ -45,20 +45,20 @@ else
args="$args --env SCCACHE_DIR=/sccache --volume $HOME/.cache/sccache:/sccache"
fi

exec docker \
run \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed this is much faster, about 4min30sec total for the ALLOW_PR builder. But I'm not sure that disabling the docker run entirely is intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blast my attempt to improve our ci by 100000% percent has been foiled!

(definition not intentional to leave this change in)

@@ -1,63 +0,0 @@
From 2739047682590b1df473401b4febf424f857fccf Mon Sep 17 00:00:00 2001
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to drop this s390x patch?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Heh that'd explain why it failed on the bots, forgot we had a gitignore for *.patch

Previously we would use one builder on Travis to produce two sets of host
compilers for two different targets. Unfortunately though we've recently
increased how much we're building for each target so this is starting to take
unnecessarily long (rust-lang#40804). This commit splits the dist builders in two by
ensuring that we only dist one target on each builder, which should take a much
shorter amount of time. This should also unblock other work such as landing the
RLS (rust-lang#40584).
@TimNN
Copy link
Contributor

TimNN commented Apr 4, 2017

@bors r+

Approving since we need this to land #41045, which is currently blocking the queue.

@bors
Copy link
Contributor

bors commented Apr 4, 2017

📌 Commit 541512b has been approved by TimNN

@TimNN TimNN mentioned this pull request Apr 4, 2017
TimNN added a commit to TimNN/rust that referenced this pull request Apr 4, 2017
travis: Split all dist builders in two

Previously we would use one builder on Travis to produce two sets of host
compilers for two different targets. Unfortunately though we've recently
increased how much we're building for each target so this is starting to take
unnecessarily long (rust-lang#40804). This commit splits the dist builders in two by
ensuring that we only dist one target on each builder, which should take a much
shorter amount of time. This should also unblock other work such as landing the
RLS (rust-lang#40584).
@frewsxcv
Copy link
Member

frewsxcv commented Apr 4, 2017

Failure on IMAGE=dist-x86-linux:

unable to prepare context: unable to evaluate symlinks in context path: lstat /home/travis/build/rust-lang/rust/src/ci/docker/dist-x86-linux: no such file or directory

https://travis-ci.org/rust-lang/rust/jobs/218515231

@frewsxcv
Copy link
Member

frewsxcv commented Apr 4, 2017

Follow up from my last comment, this should fix the issue:

b012adc

bors added a commit that referenced this pull request Apr 4, 2017
Rollup of 1 pull requests

- Successful merges: #40998
- Failed merges: #41045
@bors bors merged commit 541512b into rust-lang:master Apr 4, 2017
@alexcrichton alexcrichton deleted the split-dist branch April 4, 2017 23:08
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.

9 participants