Skip to content

Commit 63eaa60

Browse files
committed
Use --host='' instead of --host ''
Trying to fix a problem in CI. Maybe some version of Docker is not passing '' args correctly?
1 parent 6bd57e3 commit 63eaa60

File tree

10 files changed

+14
-14
lines changed

10 files changed

+14
-14
lines changed

src/ci/docker/host-x86_64/arm-android/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ENV TARGETS=arm-linux-androideabi
3131

3232
ENV RUST_CONFIGURE_ARGS --arm-linux-androideabi-ndk=/android/ndk/arm-14
3333

34-
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target $TARGETS
34+
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
3535

3636
COPY scripts/sccache.sh /scripts/
3737
RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/armhf-gnu/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ COPY scripts/sccache.sh /scripts/
7979
RUN sh /scripts/sccache.sh
8080

8181
ENV RUST_CONFIGURE_ARGS --qemu-armhf-rootfs=/tmp/rootfs
82-
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target arm-unknown-linux-gnueabihf
82+
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf
8383

8484
ENV NO_CHANGE_USER=1

src/ci/docker/host-x86_64/disabled/asmjs/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ENV EMCC_CFLAGS=-O1
3434
# Emscripten installation is user-specific
3535
ENV NO_CHANGE_USER=1
3636

37-
ENV SCRIPT python3 ../x.py --stage 2 test --host '' --target $TARGETS
37+
ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target $TARGETS
3838

3939
# This is almost identical to the wasm32-unknown-emscripten target, so
4040
# running with assertions again is not useful

src/ci/docker/host-x86_64/disabled/dist-x86_64-redox/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ ENV \
1919
CXX_x86_64_unknown_redox=x86_64-unknown-redox-g++
2020

2121
ENV RUST_CONFIGURE_ARGS --enable-extended
22-
ENV SCRIPT python3 ../x.py dist --host '' --target x86_64-unknown-redox
22+
ENV SCRIPT python3 ../x.py dist --host='' --target x86_64-unknown-redox

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ENV RUST_CONFIGURE_ARGS \
3232
--x86_64-linux-android-ndk=/android/ndk/x86_64-21 \
3333
--disable-docs
3434

35-
ENV SCRIPT python3 ../x.py dist --host '' --target $TARGETS
35+
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS
3636

3737
COPY scripts/sccache.sh /scripts/
3838
RUN sh /scripts/sccache.sh

src/ci/docker/host-x86_64/dist-i586-gnu-i586-i686-musl/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,5 @@ ENV CFLAGS_i586_unknown_linux_musl=-Wa,-mrelax-relocations=no
4747
ENV TARGETS=i586-unknown-linux-gnu,i686-unknown-linux-musl
4848

4949
ENV SCRIPT \
50-
python3 ../x.py --stage 2 test --host '' --target $TARGETS && \
51-
python3 ../x.py dist --host '' --target $TARGETS,i586-unknown-linux-musl
50+
python3 ../x.py --stage 2 test --host='' --target $TARGETS && \
51+
python3 ../x.py dist --host='' --target $TARGETS,i586-unknown-linux-musl

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ ENV RUST_CONFIGURE_ARGS \
187187
--disable-docs
188188

189189
ENV SCRIPT \
190-
python3 ../x.py --stage 2 test --host '' --target $RUN_MAKE_TARGETS src/test/run-make && \
191-
python3 ../x.py dist --host '' --target $TARGETS
190+
python3 ../x.py --stage 2 test --host='' --target $RUN_MAKE_TARGETS src/test/run-make && \
191+
python3 ../x.py dist --host='' --target $TARGETS
192192

193193
# sccache
194194
COPY scripts/sccache.sh /scripts/

src/ci/docker/host-x86_64/dist-various-2/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,4 @@ ENV RUST_CONFIGURE_ARGS --enable-extended --enable-lld --disable-docs \
110110
--set target.wasm32-wasi.wasi-root=/wasm32-wasi \
111111
--musl-root-armv7=/musl-armv7
112112

113-
ENV SCRIPT python3 ../x.py dist --host '' --target $TARGETS
113+
ENV SCRIPT python3 ../x.py dist --host='' --target $TARGETS

src/ci/docker/host-x86_64/test-various/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ENV RUST_CONFIGURE_ARGS \
4141
ENV NO_DEBUG_ASSERTIONS=1
4242

4343
ENV WASM_TARGETS=wasm32-unknown-unknown
44-
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $WASM_TARGETS \
44+
ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $WASM_TARGETS \
4545
src/test/run-make \
4646
src/test/ui \
4747
src/test/compile-fail \
@@ -50,13 +50,13 @@ ENV WASM_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $WASM_T
5050
library/core
5151

5252
ENV NVPTX_TARGETS=nvptx64-nvidia-cuda
53-
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $NVPTX_TARGETS \
53+
ENV NVPTX_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $NVPTX_TARGETS \
5454
src/test/run-make \
5555
src/test/assembly
5656

5757
ENV MUSL_TARGETS=x86_64-unknown-linux-musl \
5858
CC_x86_64_unknown_linux_musl=x86_64-linux-musl-gcc \
5959
CXX_x86_64_unknown_linux_musl=x86_64-linux-musl-g++
60-
ENV MUSL_SCRIPT python3 /checkout/x.py --stage 2 test --host '' --target $MUSL_TARGETS
60+
ENV MUSL_SCRIPT python3 /checkout/x.py --stage 2 test --host='' --target $MUSL_TARGETS
6161

6262
ENV SCRIPT $WASM_SCRIPT && $NVPTX_SCRIPT && $MUSL_SCRIPT

src/ci/docker/host-x86_64/wasm32/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ ENV NO_CHANGE_USER=1
5353

5454
# FIXME: Re-enable these tests once https://github.com/rust-lang/cargo/pull/7476
5555
# is picked up by CI
56-
ENV SCRIPT python3 ../x.py test --stage 2 --host '' --target $TARGETS \
56+
ENV SCRIPT python3 ../x.py test --stage 2 --host='' --target $TARGETS \
5757
--exclude library/core \
5858
--exclude library/alloc \
5959
--exclude library/proc_macro \

0 commit comments

Comments
 (0)