Skip to content

Updated docker images to share scripts #43129

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jul 13, 2017
Merged

Conversation

Ophirr33
Copy link
Contributor

@Ophirr33 Ophirr33 commented Jul 8, 2017

Attempts to resolve #42201. I managed to pull out five scripts (android-base-apt-get, ubuntu16-apt-get, make3, rustbuild-setup, and crosstool-ng). Let me know if there's more I can do or if I should change some names.
r? @malbarbo

@Ophirr33
Copy link
Contributor Author

Ophirr33 commented Jul 9, 2017

Fixes #42201

@TimNN
Copy link
Contributor

TimNN commented Jul 9, 2017

Is it possible that you forgot to commit the actual scripts? At least I can't find them in the Github diff.

@Ophirr33
Copy link
Contributor Author

Ophirr33 commented Jul 9, 2017

I did forget to push them, whoops. I just pushed them and then tried to squash the commits, but I don't think I'm squashing them correctly since it shows 3 commits that's trying to merge.

@TimNN
Copy link
Contributor

TimNN commented Jul 9, 2017

@Ophirr33: The easiest thing is probably to just do a git reset b695889 and then git add / git commit the changes again. Alternatively just let me know and I can do and push the rebase for you.

@Ophirr33
Copy link
Contributor Author

Ophirr33 commented Jul 9, 2017

Got it, thanks for the help @TimNN!

@carols10cents carols10cents added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 10, 2017
@arielb1
Copy link
Contributor

arielb1 commented Jul 11, 2017

What's the status of this? Are you waiting for @malbarbo to review this?

@Ophirr33
Copy link
Contributor Author

Ophirr33 commented Jul 12, 2017

@arielb1 Maybe? I just tagged @malbarbo because he created the issue. Haven't heard anything yet.

Sent from my Samsung SM-G935V using FastHub

@arielb1
Copy link
Contributor

arielb1 commented Jul 12, 2017

He does not even have r? rights.

r? @alexcrichton

Copy link
Member

@alexcrichton alexcrichton left a comment

Choose a reason for hiding this comment

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

Thanks @Ophirr33!

RUN curl -o /usr/local/bin/sccache \
https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-05-12-sccache-x86_64-unknown-linux-musl && \
chmod +x /usr/local/bin/sccache
# dumb-init
Copy link
Member

Choose a reason for hiding this comment

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

It's ok to remove these comments, I don't think they necessarily add much to what's already written down

@@ -0,0 +1,36 @@
# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
Copy link
Member

Choose a reason for hiding this comment

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

Mind renaming this to include the term "cross" in the script name? I think this list of packages is mostly suitable for building crosstool-ng and such and running that inside the container.

@Ophirr33
Copy link
Contributor Author

@alexcrichton Done!

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Jul 13, 2017

📌 Commit 2503461 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Jul 13, 2017

⌛ Testing commit 2503461 with merge 06ffdeb...

bors added a commit that referenced this pull request Jul 13, 2017
Updated docker images to share scripts

Attempts to resolve #42201. I managed to pull out five scripts (android-base-apt-get, ubuntu16-apt-get, make3, rustbuild-setup, and crosstool-ng). Let me know if there's more I can do or if I should change some names.
r? @malbarbo
@bors
Copy link
Collaborator

bors commented Jul 13, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 06ffdeb to master...

@bors bors merged commit 2503461 into rust-lang:master Jul 13, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update docker images to share scripts when possible
6 participants