use shared scripts for init and sccache in cross image

[venkatagiri]

cc #42201
cc @malbarbo

[rust-highfive]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

[alexcrichton]

@bors: r+

Thanks @venkatagiri!

[bors]

📌 Commit 5ce2eb1 has been approved by alexcrichton

[malbarbo]

@venkatagiri LGTM, thanks!

If your are interested, you could extract this and put in a script install-mips-musl.sh, and this in a script install-mipsel-musl.sh. Otherwise, I think we are ready to go. @alexcrichton?

Edit: I saw @alexcrichton r+ after i wrote this comment

[alexcrichton]

Eh the URLs there are different enough it may not be worth to do so, but I'd be fine either way!

[malbarbo]

Could you clarify what you mean by "Eh the URLs there are different enough it may not be worth to do so"?

My suggestion was to create two scripts, so that following the image build is easy because the reader is not distract by details. It would read, build-rumprun, build-arm-musl, install-mips-musl, install-mipsel-musl, etc.

[venkatagiri]

Yes. Even I thought I could move the install URLs into their own script. But, since they weren't shared across images, wasn't sure if I need to. If that's fine, I can go ahead and move them into scripts.

…

On May 25, 2017 8:44 AM, "Marco A L Barbosa" ***@***.***> wrote: Could you clarify what you mean by "Eh the URLs there are different enough it may not be worth to do so"? My suggestion was to create two scripts, so that following the image build is easy because the reader is not distract by details. It would read, build-rumprun, build-arm-musl, install-mips-musl, install-mipsel-musl, etc. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#42218 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAOIKVBRlWIuN07NEt9GbaEHq7g59nTIks5r9ZOzgaJpZM4NmBir> .

[alexcrichton]

Oh I'd be fine either way. I personally prefer for one-off scripts to just be in the Dockerfile, but I don't mind doing otherwise!

[venkatagiri]

@alexcrichton I have extracted the musl installation from Dockerfile into scripts.

[venkatagiri]

Fixed the tidy errors by splitting the URL into variables.

[alexcrichton]

@bors: r+

Looks great!

[bors]

📌 Commit cb7dbd5 has been approved by alexcrichton

[Mark-Simulacrum]

@bors r-

[00:05:23] Step 11 : RUN ./install-mips-musl.sh
[00:05:23]  ---> Running in e58d0caf3c29
[00:05:23] /bin/sh: 1: ./install-mips-musl.sh: Permission denied
[00:05:23] The command '/bin/sh -c ./install-mips-musl.sh' returned a non-zero code: 126
[00:05:23] The command has failed after 5 attempts.

[venkatagiri]

@Mark-Simulacrum Fixed the file permissions.

[Mark-Simulacrum]

I seem to recall a chmod +x being necessary to do so -- but I may be wrong. I'm going to holdoff on re- r+ until someone more familiar comes along to re-review.

[venkatagiri]

Yes. I ran chmod +x on the files and merged them into last commit.
The file shows as "Executable file" now. https://github.com/venkatagiri/rust/blob/7acc999b4249a774dd617153524e3819b2ab9da7/src/ci/docker/cross/install-mips-musl.sh

[Mark-Simulacrum]

Ah, okay, I looked in the scripts and I think I was wrong -- we don't actually need to add +x beyond what we store in git.

@bors r=alexchrichton

[bors]

📌 Commit 7acc999 has been approved by alexchrichton

[bors]

⌛ Testing commit 7acc999 with merge 920c479...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: alexchrichton
Pushing 920c479 to master...