Skip to content

Commit d15c950

Browse files
committed
ci: move shared scripts to src/ci/docker/scripts/
1 parent 307d8e5 commit d15c950

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

src/ci/docker/arm-android/Dockerfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm 9
2727

@@ -35,7 +35,7 @@ RUN dpkg --add-architecture i386 && \
3535
openjdk-9-jre-headless \
3636
tzdata
3737

38-
COPY android-sdk.sh /scripts/
38+
COPY scripts/android-sdk.sh /scripts/
3939
RUN . /scripts/android-sdk.sh && \
4040
download_and_create_avd tools_r25.2.5-linux.zip armeabi-v7a 18
4141

@@ -52,9 +52,9 @@ ENV RUST_CONFIGURE_ARGS \
5252
ENV SCRIPT python2.7 ../x.py test --target $TARGETS
5353

5454
# sccache
55-
COPY sccache.sh /scripts/
55+
COPY scripts/sccache.sh /scripts/
5656
RUN sh /scripts/sccache.sh
5757

5858
# init
59-
COPY android-start-emulator.sh /scripts/
59+
COPY scripts/android-start-emulator.sh /scripts/
6060
ENTRYPOINT ["/usr/bin/dumb-init", "--", "/scripts/android-start-emulator.sh"]

src/ci/docker/disabled/dist-aarch64-android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip arm64 21
2727

@@ -43,7 +43,7 @@ ENV RUST_CONFIGURE_ARGS \
4343
ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
4444

4545
# sccache
46-
COPY sccache.sh /scripts/
46+
COPY scripts/sccache.sh /scripts/
4747
RUN sh /scripts/sccache.sh
4848

4949
# init

src/ci/docker/disabled/dist-armv7-android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_ndk android-ndk-r13b-linux-x86_64.zip && \
2727
make_standalone_toolchain arm 9 && \
@@ -61,7 +61,7 @@ ENV SCRIPT \
6161
python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
6262

6363
# sccache
64-
COPY sccache.sh /scripts/
64+
COPY scripts/sccache.sh /scripts/
6565
RUN sh /scripts/sccache.sh
6666

6767
# init

src/ci/docker/disabled/dist-i686-android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_ndk android-ndk-r13b-linux-x86_64.zip && \
2727
make_standalone_toolchain x86 9 && \
@@ -61,7 +61,7 @@ ENV SCRIPT \
6161
python2.7 ../x.py dist --host $HOSTS --target $HOSTS)
6262

6363
# sccache
64-
COPY sccache.sh /scripts/
64+
COPY scripts/sccache.sh /scripts/
6565
RUN sh /scripts/sccache.sh
6666

6767
# init

src/ci/docker/disabled/dist-x86_64-android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_and_make_toolchain android-ndk-r13b-linux-x86_64.zip x86_64 21
2727

@@ -43,7 +43,7 @@ ENV RUST_CONFIGURE_ARGS \
4343
ENV SCRIPT python2.7 ../x.py dist --target $HOSTS --host $HOSTS
4444

4545
# sccache
46-
COPY sccache.sh /scripts/
46+
COPY scripts/sccache.sh /scripts/
4747
RUN sh /scripts/sccache.sh
4848

4949
# init

src/ci/docker/dist-android/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ RUN apt-get update && \
1717
xz-utils
1818

1919
# dumb-init
20-
COPY dumb-init.sh /scripts/
20+
COPY scripts/dumb-init.sh /scripts/
2121
RUN sh /scripts/dumb-init.sh
2222

2323
# ndk
24-
COPY android-ndk.sh /scripts/
24+
COPY scripts/android-ndk.sh /scripts/
2525
RUN . /scripts/android-ndk.sh && \
2626
download_ndk android-ndk-r13b-linux-x86_64.zip && \
2727
make_standalone_toolchain arm 9 && \
@@ -49,7 +49,7 @@ ENV RUST_CONFIGURE_ARGS \
4949
ENV SCRIPT python2.7 ../x.py dist --target $TARGETS
5050

5151
# cache
52-
COPY sccache.sh /scripts/
52+
COPY scripts/sccache.sh /scripts/
5353
RUN sh /scripts/sccache.sh
5454

5555
# init
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)