diff options
| author | kennytm <kennytm@gmail.com> | 2019-03-20 04:34:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-20 04:34:07 +0800 |
| commit | f31974a18e9bb210e1057b73674077436b122107 (patch) | |
| tree | bef3a73399ea725f98f39ad449ee8cc5fdc0e415 /src/ci | |
| parent | abdb7733f47d2cfe27a1f25275b16b06adb35144 (diff) | |
| parent | f8bffad4f1f0650ae56e17221d9443f9c2a6ab20 (diff) | |
| download | rust-f31974a18e9bb210e1057b73674077436b122107.tar.gz rust-f31974a18e9bb210e1057b73674077436b122107.zip | |
Rollup merge of #59257 - redox-os:upstream-redox, r=sanxiyn
Update CI configuration for building Redox libraries This fixes https://github.com/rust-lang/rust/issues/59254
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/disabled/dist-x86_64-redox/Dockerfile | 4 | ||||
| -rwxr-xr-x | src/ci/docker/dist-various-1/install-x86_64-redox.sh | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/ci/docker/disabled/dist-x86_64-redox/Dockerfile b/src/ci/docker/disabled/dist-x86_64-redox/Dockerfile index f4c25f791bc..11a3acd68e3 100644 --- a/src/ci/docker/disabled/dist-x86_64-redox/Dockerfile +++ b/src/ci/docker/disabled/dist-x86_64-redox/Dockerfile @@ -7,8 +7,8 @@ COPY scripts/crosstool-ng.sh /scripts/ RUN sh /scripts/crosstool-ng.sh WORKDIR /tmp -COPY cross/install-x86_64-redox.sh /tmp/ -RUN ./install-x86_64-redox.sh +COPY dist-various-1/install-x86_64-redox.sh /scripts/ +RUN sh /scripts/install-x86_64-redox.sh COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh diff --git a/src/ci/docker/dist-various-1/install-x86_64-redox.sh b/src/ci/docker/dist-various-1/install-x86_64-redox.sh index c39be14941c..339042bb672 100755 --- a/src/ci/docker/dist-various-1/install-x86_64-redox.sh +++ b/src/ci/docker/dist-various-1/install-x86_64-redox.sh @@ -3,11 +3,5 @@ set -ex -apt-get update -apt-get install -y --no-install-recommends software-properties-common apt-transport-https - -apt-key adv --batch --yes --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys AA12E97F0881517F -add-apt-repository -y 'deb https://static.redox-os.org/toolchain/apt /' - -apt-get update -apt-get install -y x86-64-unknown-redox-gcc +curl https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz | \ +tar --extract --gzip --directory /usr/local |