bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rename x86_64-gnu-integration builder to x86_64-fuchsia

Browse source 
This better reflects what the builder actually does.
This commit is contained in:
Tyler Mandry 2024-06-28 16:08:57 -07:00
parent a8382023b4
commit 078d9d8aa9
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile → src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile
View file

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

8
src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh → src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh
View file

@ -5,14 +5,14 @@
# #
# You may run this script locally using Docker with the following command: # You may run this script locally using Docker with the following command:
# #
# $ src/ci/docker/run.sh x86_64-gnu-integration # $ src/ci/docker/run.sh x86_64-fuchsia
# #
# Alternatively, from within the container with --dev, assuming you have made it # Alternatively, from within the container with --dev, assuming you have made it
# as far as building the toolchain with the above command: # as far as building the toolchain with the above command:
# #
# $ src/ci/docker/run.sh --dev x86_64-gnu-integration # $ src/ci/docker/run.sh --dev x86_64-fuchsia
# docker# git config --global --add safe.directory /checkout/obj/fuchsia # docker# git config --global --add safe.directory /checkout/obj/fuchsia
# docker# ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh # docker# ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh
# #
# Also see the docs in the rustc-dev-guide for more info: # Also see the docs in the rustc-dev-guide for more info:
# https://github.com/rust-lang/rustc-dev-guide/pull/1989 # https://github.com/rust-lang/rustc-dev-guide/pull/1989
@ -21,7 +21,7 @@ set -euf -o pipefail
# Set this variable to 1 to disable updating the Fuchsia checkout. This is # Set this variable to 1 to disable updating the Fuchsia checkout. This is
# useful for making local changes. You can find the Fuchsia checkout in # useful for making local changes. You can find the Fuchsia checkout in
# `obj/x86_64-gnu-integration/fuchsia` in your local checkout after running this # `obj/x86_64-fuchsia/fuchsia` in your local checkout after running this
# job for the first time. # job for the first time.
KEEP_CHECKOUT= KEEP_CHECKOUT=

14
src/ci/github-actions/jobs.yml
View file

@ -208,6 +208,13 @@ auto:
- image: test-various - image: test-various
<<: *job-linux-4c <<: *job-linux-4c
- image: x86_64-fuchsia
# Only run this job on the nightly channel. Fuchsia requires
# nightly features to compile, and this job would fail if
# executed on beta and stable.
only_on_channel: nightly
<<: *job-linux-8c
- image: x86_64-gnu - image: x86_64-gnu
<<: *job-linux-4c <<: *job-linux-4c
@ -229,13 +236,6 @@ auto:
- image: x86_64-gnu-aux - image: x86_64-gnu-aux
<<: *job-linux-4c <<: *job-linux-4c
- image: x86_64-gnu-integration
# Only run this job on the nightly channel. Fuchsia requires
# nightly features to compile, and this job would fail if
# executed on beta and stable.
only_on_channel: nightly
<<: *job-linux-8c
- image: x86_64-gnu-debug - image: x86_64-gnu-debug
<<: *job-linux-4c <<: *job-linux-4c