From 79b47a1f2684715631bda6cdf9570677f4714e83 Mon Sep 17 00:00:00 2001 From: Marco A L Barbosa Date: Mon, 4 Dec 2017 16:38:19 -0200 Subject: [PATCH] Rename cross(2) builder to dist-various-{1,2} Follows the convention of the other builders. --- .travis.yml | 4 ++-- src/ci/docker/{cross => dist-various-1}/Dockerfile | 10 +++++----- .../docker/{cross => dist-various-1}/build-arm-musl.sh | 0 .../docker/{cross => dist-various-1}/build-rumprun.sh | 0 .../{cross => dist-various-1}/install-mips-musl.sh | 0 .../{cross => dist-various-1}/install-mipsel-musl.sh | 0 .../{cross => dist-various-1}/install-x86_64-redox.sh | 0 src/ci/docker/{cross2 => dist-various-2}/Dockerfile | 4 ++-- .../build-fuchsia-toolchain.sh | 0 .../build-solaris-toolchain.sh | 0 src/ci/docker/{cross2 => dist-various-2}/shared.sh | 0 11 files changed, 9 insertions(+), 9 deletions(-) rename src/ci/docker/{cross => dist-various-1}/Dockerfile (88%) rename src/ci/docker/{cross => dist-various-1}/build-arm-musl.sh (100%) rename src/ci/docker/{cross => dist-various-1}/build-rumprun.sh (100%) rename src/ci/docker/{cross => dist-various-1}/install-mips-musl.sh (100%) rename src/ci/docker/{cross => dist-various-1}/install-mipsel-musl.sh (100%) rename src/ci/docker/{cross => dist-various-1}/install-x86_64-redox.sh (100%) rename src/ci/docker/{cross2 => dist-various-2}/Dockerfile (93%) rename src/ci/docker/{cross2 => dist-various-2}/build-fuchsia-toolchain.sh (100%) rename src/ci/docker/{cross2 => dist-various-2}/build-solaris-toolchain.sh (100%) rename src/ci/docker/{cross2 => dist-various-2}/shared.sh (100%) diff --git a/.travis.yml b/.travis.yml index 40122df2d94..b2840ac3121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -112,9 +112,9 @@ matrix: if: branch = auto - env: IMAGE=armhf-gnu if: branch = auto - - env: IMAGE=cross DEPLOY=1 + - env: IMAGE=dist-various-1 DEPLOY=1 if: branch = auto - - env: IMAGE=cross2 DEPLOY=1 + - env: IMAGE=dist-various-2 DEPLOY=1 if: branch = auto - env: IMAGE=dist-aarch64-linux DEPLOY=1 if: branch = auto diff --git a/src/ci/docker/cross/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile similarity index 88% rename from src/ci/docker/cross/Dockerfile rename to src/ci/docker/dist-various-1/Dockerfile index 05745709a07..a616693311a 100644 --- a/src/ci/docker/cross/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -24,19 +24,19 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ WORKDIR /tmp -COPY cross/build-rumprun.sh /tmp/ +COPY dist-various-1/build-rumprun.sh /tmp/ RUN ./build-rumprun.sh -COPY cross/build-arm-musl.sh /tmp/ +COPY dist-various-1/build-arm-musl.sh /tmp/ RUN ./build-arm-musl.sh -COPY cross/install-mips-musl.sh /tmp/ +COPY dist-various-1/install-mips-musl.sh /tmp/ RUN ./install-mips-musl.sh -COPY cross/install-mipsel-musl.sh /tmp/ +COPY dist-various-1/install-mipsel-musl.sh /tmp/ RUN ./install-mipsel-musl.sh -COPY cross/install-x86_64-redox.sh /tmp/ +COPY dist-various-1/install-x86_64-redox.sh /tmp/ RUN ./install-x86_64-redox.sh ENV TARGETS=asmjs-unknown-emscripten diff --git a/src/ci/docker/cross/build-arm-musl.sh b/src/ci/docker/dist-various-1/build-arm-musl.sh similarity index 100% rename from src/ci/docker/cross/build-arm-musl.sh rename to src/ci/docker/dist-various-1/build-arm-musl.sh diff --git a/src/ci/docker/cross/build-rumprun.sh b/src/ci/docker/dist-various-1/build-rumprun.sh similarity index 100% rename from src/ci/docker/cross/build-rumprun.sh rename to src/ci/docker/dist-various-1/build-rumprun.sh diff --git a/src/ci/docker/cross/install-mips-musl.sh b/src/ci/docker/dist-various-1/install-mips-musl.sh similarity index 100% rename from src/ci/docker/cross/install-mips-musl.sh rename to src/ci/docker/dist-various-1/install-mips-musl.sh diff --git a/src/ci/docker/cross/install-mipsel-musl.sh b/src/ci/docker/dist-various-1/install-mipsel-musl.sh similarity index 100% rename from src/ci/docker/cross/install-mipsel-musl.sh rename to src/ci/docker/dist-various-1/install-mipsel-musl.sh diff --git a/src/ci/docker/cross/install-x86_64-redox.sh b/src/ci/docker/dist-various-1/install-x86_64-redox.sh similarity index 100% rename from src/ci/docker/cross/install-x86_64-redox.sh rename to src/ci/docker/dist-various-1/install-x86_64-redox.sh diff --git a/src/ci/docker/cross2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile similarity index 93% rename from src/ci/docker/cross2/Dockerfile rename to src/ci/docker/dist-various-2/Dockerfile index f16d97d39ef..c7885db559a 100644 --- a/src/ci/docker/cross2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -21,8 +21,8 @@ RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7 RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main' WORKDIR /tmp -COPY cross2/shared.sh cross2/build-fuchsia-toolchain.sh /tmp/ -COPY cross2/build-solaris-toolchain.sh /tmp/ +COPY dist-various-2/shared.sh dist-various-2/build-fuchsia-toolchain.sh /tmp/ +COPY dist-various-2/build-solaris-toolchain.sh /tmp/ RUN /tmp/build-fuchsia-toolchain.sh RUN /tmp/build-solaris-toolchain.sh x86_64 amd64 solaris-i386 RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc diff --git a/src/ci/docker/cross2/build-fuchsia-toolchain.sh b/src/ci/docker/dist-various-2/build-fuchsia-toolchain.sh similarity index 100% rename from src/ci/docker/cross2/build-fuchsia-toolchain.sh rename to src/ci/docker/dist-various-2/build-fuchsia-toolchain.sh diff --git a/src/ci/docker/cross2/build-solaris-toolchain.sh b/src/ci/docker/dist-various-2/build-solaris-toolchain.sh similarity index 100% rename from src/ci/docker/cross2/build-solaris-toolchain.sh rename to src/ci/docker/dist-various-2/build-solaris-toolchain.sh diff --git a/src/ci/docker/cross2/shared.sh b/src/ci/docker/dist-various-2/shared.sh similarity index 100% rename from src/ci/docker/cross2/shared.sh rename to src/ci/docker/dist-various-2/shared.sh