Skip to content

Commit 6abb443

Browse files
committed
Rename Fuchsia job from x86_64-gnu-integration to fuchsia
1 parent 32c6bf5 commit 6abb443

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ ENV RUST_CONFIGURE_ARGS \
7676
--set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld
7777
ENV SCRIPT \
7878
python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \
79-
bash ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
79+
bash ../src/ci/docker/host-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/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 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 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/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/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

+2-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ auto:
229229
- image: x86_64-gnu-aux
230230
<<: *job-linux-4c
231231

232-
- image: x86_64-gnu-integration
232+
# Tests the integration with Fuchsia
233+
- image: fuchsia
233234
# Only run this job on the nightly channel. Fuchsia requires
234235
# nightly features to compile, and this job would fail if
235236
# executed on beta and stable.

0 commit comments

Comments
 (0)