ci: move shared scripts to src/ci/docker/scripts/

rust-lang · May 18, 2017 · d15c950 · d15c950
1 parent 307d8e5
commit d15c950
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
 
@@ -35,7 +35,7 @@ RUN dpkg --add-architecture i386 && \
   openjdk-9-jre-headless \
   tzdata
 
-COPY android-sdk.sh /scripts/
+COPY scripts/android-sdk.sh /scripts/
 RUN . /scripts/android-sdk.sh && \
     download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18
 
@@ -52,9 +52,9 @@ ENV RUST_CONFIGURE_ARGS \
 ENV SCRIPT python2.7 ../x.py test --target $TARGETS
 
 # sccache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init
-COPY android-start-emulator.sh /scripts/
+COPY scripts/android-start-emulator.sh /scripts/
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"]
diff --git a/src/ci/docker/disabled/dist-aarch64-android/Dockerfile b/src/ci/docker/disabled/dist-aarch64-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm64 21
 
@@ -43,7 +43,7 @@ ENV RUST_CONFIGURE_ARGS \
 ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
 
 # sccache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init

diff --git a/src/ci/docker/disabled/dist-armv7-android/Dockerfile b/src/ci/docker/disabled/dist-armv7-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_ndk android-ndk-r13b-linux-x86_64.zip && \
     make_standalone_toolchain arm 9 && \
@@ -61,7 +61,7 @@ ENV SCRIPT \
     python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
 
 # sccache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init

diff --git a/src/ci/docker/disabled/dist-i686-android/Dockerfile b/src/ci/docker/disabled/dist-i686-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_ndk android-ndk-r13b-linux-x86_64.zip && \
     make_standalone_toolchain x86 9 && \
@@ -61,7 +61,7 @@ ENV SCRIPT \
     python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
 
 # sccache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init

diff --git a/src/ci/docker/disabled/dist-x86_64-android/Dockerfile b/src/ci/docker/disabled/dist-x86_64-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip x86_64 21
 
@@ -43,7 +43,7 @@ ENV RUST_CONFIGURE_ARGS \
 ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
 
 # sccache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init

diff --git a/src/ci/docker/dist-android/Dockerfile b/src/ci/docker/dist-android/Dockerfile
@@ -17,11 +17,11 @@ RUN apt-get update && \
   xz-utils
 
 # dumb-init
-COPY dumb-init.sh /scripts/
+COPY scripts/dumb-init.sh /scripts/
 RUN sh /scripts/dumb-init.sh
 
 # ndk
-COPY android-ndk.sh /scripts/
+COPY scripts/android-ndk.sh /scripts/
 RUN . /scripts/android-ndk.sh && \
     download_ndk android-ndk-r13b-linux-x86_64.zip && \
     make_standalone_toolchain arm 9 && \
@@ -49,7 +49,7 @@ ENV RUST_CONFIGURE_ARGS \
 ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
 
 # cache
-COPY sccache.sh /scripts/
+COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
 # init

diff --git a/src/ci/docker/android-ndk.sh → src/ci/docker/scripts/android-ndk.sh b/src/ci/docker/android-ndk.sh → src/ci/docker/scripts/android-ndk.sh
diff --git a/src/ci/docker/android-sdk.sh → src/ci/docker/scripts/android-sdk.sh b/src/ci/docker/android-sdk.sh → src/ci/docker/scripts/android-sdk.sh
diff --git a/src/ci/docker/android-start-emulator.sh → .../docker/scripts/android-start-emulator.sh b/src/ci/docker/android-start-emulator.sh → .../docker/scripts/android-start-emulator.sh
diff --git a/src/ci/docker/dumb-init.sh → src/ci/docker/scripts/dumb-init.sh b/src/ci/docker/dumb-init.sh → src/ci/docker/scripts/dumb-init.sh
diff --git a/src/ci/docker/sccache.sh → src/ci/docker/scripts/sccache.sh b/src/ci/docker/sccache.sh → src/ci/docker/scripts/sccache.sh