Skip to content

Commit 078d9d8

Browse files
committed
Rename x86_64-gnu-integration builder to x86_64-fuchsia
This better reflects what the builder actually does.
1 parent a838202 commit 078d9d8

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile renamed to src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ ENV RUST_CONFIGURE_ARGS \
7272
--set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld
7373
ENV SCRIPT \
7474
python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
75-
bash ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
75+
bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh

src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh renamed to src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#
66
# You may run this script locally using Docker with the following command:
77
#
8-
# $ src/ci/docker/run.sh x86_64-gnu-integration
8+
# $ src/ci/docker/run.sh x86_64-fuchsia
99
#
1010
# Alternatively, from within the container with --dev, assuming you have made it
1111
# as far as building the toolchain with the above command:
1212
#
13-
# $ src/ci/docker/run.sh --dev x86_64-gnu-integration
13+
# $ src/ci/docker/run.sh --dev x86_64-fuchsia
1414
# docker# git config --global --add safe.directory /checkout/obj/fuchsia
15-
# docker# ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
15+
# docker# ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh
1616
#
1717
# Also see the docs in the rustc-dev-guide for more info:
1818
# https://github.com/rust-lang/rustc-dev-guide/pull/1989
@@ -21,7 +21,7 @@ set -euf -o pipefail
2121

2222
# Set this variable to 1 to disable updating the Fuchsia checkout. This is
2323
# useful for making local changes. You can find the Fuchsia checkout in
24-
# `obj/x86_64-gnu-integration/fuchsia` in your local checkout after running this
24+
# `obj/x86_64-fuchsia/fuchsia` in your local checkout after running this
2525
# job for the first time.
2626
KEEP_CHECKOUT=
2727

src/ci/github-actions/jobs.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,13 @@ auto:
208208
- image: test-various
209209
<<: *job-linux-4c
210210

211+
- image: x86_64-fuchsia
212+
# Only run this job on the nightly channel. Fuchsia requires
213+
# nightly features to compile, and this job would fail if
214+
# executed on beta and stable.
215+
only_on_channel: nightly
216+
<<: *job-linux-8c
217+
211218
- image: x86_64-gnu
212219
<<: *job-linux-4c
213220

@@ -229,13 +236,6 @@ auto:
229236
- image: x86_64-gnu-aux
230237
<<: *job-linux-4c
231238

232-
- image: x86_64-gnu-integration
233-
# Only run this job on the nightly channel. Fuchsia requires
234-
# nightly features to compile, and this job would fail if
235-
# executed on beta and stable.
236-
only_on_channel: nightly
237-
<<: *job-linux-8c
238-
239239
- image: x86_64-gnu-debug
240240
<<: *job-linux-4c
241241

0 commit comments

Comments
 (0)