From 03d73fa6baa2523c695081d9f4f8b32a8ea7fbcf Mon Sep 17 00:00:00 2001 From: WANG Rui Date: Tue, 5 Mar 2024 16:04:02 +0800 Subject: ci: Add support for dist-loongarch64-musl --- src/ci/github-actions/jobs.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ci/github-actions') diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 4366a92fbcd..e3903c3dd5a 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -144,6 +144,9 @@ auto: - image: dist-loongarch64-linux <<: *job-linux-4c + - image: dist-loongarch64-musl + <<: *job-linux-4c + - image: dist-ohos <<: *job-linux-4c -- cgit 1.4.1-3-g733a5 From 078d9d8aa98fc1490734b51e6e151659c953bed7 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Fri, 28 Jun 2024 16:08:57 -0700 Subject: Rename x86_64-gnu-integration builder to x86_64-fuchsia This better reflects what the builder actually does. --- .../docker/host-x86_64/x86_64-fuchsia/Dockerfile | 75 ++++++++++++++++++ .../host-x86_64/x86_64-fuchsia/build-fuchsia.sh | 88 ++++++++++++++++++++++ .../host-x86_64/x86_64-gnu-integration/Dockerfile | 75 ------------------ .../x86_64-gnu-integration/build-fuchsia.sh | 88 ---------------------- src/ci/github-actions/jobs.yml | 14 ++-- 5 files changed, 170 insertions(+), 170 deletions(-) create mode 100644 src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile create mode 100755 src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh delete mode 100644 src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile delete mode 100755 src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh (limited to 'src/ci/github-actions') diff --git a/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile new file mode 100644 index 00000000000..ba3e8bdb687 --- /dev/null +++ b/src/ci/docker/host-x86_64/x86_64-fuchsia/Dockerfile @@ -0,0 +1,75 @@ +# This job builds a toolchain capable of building Fuchsia, and then builds +# Fuchsia as an integration test of the toolchain. See the build-fuchsia.sh +# script in this directory for more details. + +FROM ubuntu:22.04 + +ARG DEBIAN_FRONTEND=noninteractive +RUN apt-get update && apt-get install -y --no-install-recommends \ + build-essential \ + clang-15 \ + g++ \ + make \ + ninja-build \ + file \ + curl \ + ca-certificates \ + python3 \ + git \ + cmake \ + libssl-dev \ + sudo \ + xz-utils \ + pkg-config \ + unzip \ + && rm -rf /var/lib/apt/lists/* + +# Duplicated in dist-various-2 Dockerfile. +ENV \ + AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \ + CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \ + CFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \ + CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \ + CXXFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \ + LDFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib" + +WORKDIR /tmp +COPY scripts/shared.sh /tmp/ +COPY scripts/build-fuchsia-toolchain.sh /tmp/ +RUN /tmp/build-fuchsia-toolchain.sh + +ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar +ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \ + -C panic=abort \ + -C force-unwind-tables=yes \ + -C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \ + -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \ + -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib + +ENV TARGETS=x86_64-unknown-fuchsia +ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +ENV RUST_INSTALL_DIR /checkout/obj/install +RUN mkdir -p $RUST_INSTALL_DIR/etc + +# Fuchsia only supports LLVM. +ENV CODEGEN_BACKENDS llvm + +ENV RUST_CONFIGURE_ARGS \ + --prefix=$RUST_INSTALL_DIR \ + --sysconfdir=etc \ + --enable-lld \ + --llvm-libunwind=in-tree \ + --enable-extended \ + --disable-docs \ + --set target.x86_64-unknown-fuchsia.cc=/usr/local/bin/clang \ + --set target.x86_64-unknown-fuchsia.cxx=/usr/local/bin/clang++ \ + --set target.x86_64-unknown-fuchsia.ar=/usr/local/bin/llvm-ar \ + --set target.x86_64-unknown-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \ + --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld +ENV SCRIPT \ + python3 ../x.py install --target $TARGETS compiler/rustc library/std clippy && \ + bash ../src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh diff --git a/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh new file mode 100755 index 00000000000..c806b886dae --- /dev/null +++ b/src/ci/docker/host-x86_64/x86_64-fuchsia/build-fuchsia.sh @@ -0,0 +1,88 @@ +#!/usr/bin/env bash + +# Downloads and builds the Fuchsia operating system using a toolchain installed +# in $RUST_INSTALL_DIR. +# +# You may run this script locally using Docker with the following command: +# +# $ src/ci/docker/run.sh x86_64-fuchsia +# +# Alternatively, from within the container with --dev, assuming you have made it +# as far as building the toolchain with the above command: +# +# $ src/ci/docker/run.sh --dev x86_64-fuchsia +# docker# git config --global --add safe.directory /checkout/obj/fuchsia +# 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: +# https://github.com/rust-lang/rustc-dev-guide/pull/1989 + +set -euf -o pipefail + +# 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 +# `obj/x86_64-fuchsia/fuchsia` in your local checkout after running this +# job for the first time. +KEEP_CHECKOUT= + +# Any upstream refs that should be cherry-picked. This can be used to include +# Gerrit changes from https://fxrev.dev during development (click the "Download" +# button on a changelist to see the cherry pick ref). Example: +# PICK_REFS=(refs/changes/71/1054071/2 refs/changes/74/1054574/2) +PICK_REFS=() + +# The commit hash of Fuchsia's integration.git to check out. This controls the +# commit hash of fuchsia.git and some other repos in the "monorepo" checkout, in +# addition to versions of prebuilts. It should be bumped regularly by the +# Fuchsia team – we aim for every 1-2 months. +INTEGRATION_SHA=d1d2f20efe46e22be179953dd6726c96eced54ab + +checkout=fuchsia +jiri=.jiri_root/bin/jiri + +set -x + +if [ -z "$KEEP_CHECKOUT" ]; then + # This script will: + # - create a directory named "fuchsia" if it does not exist + # - download "jiri" to "fuchsia/.jiri_root/bin" + curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" \ + | base64 --decode \ + | bash -s $checkout + + cd $checkout + + $jiri init \ + -partial=true \ + -analytics-opt=false \ + . + + $jiri import \ + -name=integration \ + -revision=$INTEGRATION_SHA \ + -overwrite=true \ + flower \ + "https://fuchsia.googlesource.com/integration" + + if [ -d ".git" ]; then + # Wipe out any local changes if we're reusing a checkout. + git checkout --force JIRI_HEAD + fi + + $jiri update -autoupdate=false + + echo integration commit = $(git -C integration rev-parse HEAD) + + for git_ref in "${PICK_REFS[@]}"; do + git fetch https://fuchsia.googlesource.com/fuchsia $git_ref + git cherry-pick --no-commit FETCH_HEAD + done +else + echo Reusing existing Fuchsia checkout + cd $checkout +fi + +# Run the script inside the Fuchsia checkout responsible for building Fuchsia. +# You can change arguments to the build by setting KEEP_CHECKOUT=1 above and +# modifying them in build_fuchsia_from_rust_ci.sh. +bash scripts/rust/build_fuchsia_from_rust_ci.sh diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile deleted file mode 100644 index be209a9de9f..00000000000 --- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile +++ /dev/null @@ -1,75 +0,0 @@ -# This job builds a toolchain capable of building Fuchsia, and then builds -# Fuchsia as an integration test of the toolchain. See the build-fuchsia.sh -# script in this directory for more details. - -FROM ubuntu:22.04 - -ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - clang-15 \ - g++ \ - make \ - ninja-build \ - file \ - curl \ - ca-certificates \ - python3 \ - git \ - cmake \ - libssl-dev \ - sudo \ - xz-utils \ - pkg-config \ - unzip \ - && rm -rf /var/lib/apt/lists/* - -# Duplicated in dist-various-2 Dockerfile. -ENV \ - AR_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-ar \ - CC_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang \ - CFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \ - CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \ - CXXFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -I/usr/local/core-linux-amd64-fuchsia-sdk/pkg/fdio/include" \ - LDFLAGS_x86_64_unknown_fuchsia="--target=x86_64-unknown-fuchsia --sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot -L/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib" - -WORKDIR /tmp -COPY scripts/shared.sh /tmp/ -COPY scripts/build-fuchsia-toolchain.sh /tmp/ -RUN /tmp/build-fuchsia-toolchain.sh - -ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_AR /usr/local/bin/llvm-ar -ENV CARGO_TARGET_X86_64_UNKNOWN_FUCHSIA_RUSTFLAGS \ - -C panic=abort \ - -C force-unwind-tables=yes \ - -C link-arg=--sysroot=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot \ - -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/sysroot/lib \ - -Lnative=/usr/local/core-linux-amd64-fuchsia-sdk/arch/x64/lib - -ENV TARGETS=x86_64-unknown-fuchsia -ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV RUST_INSTALL_DIR /checkout/obj/install -RUN mkdir -p $RUST_INSTALL_DIR/etc - -# Fuchsia only supports LLVM. -ENV CODEGEN_BACKENDS llvm - -ENV RUST_CONFIGURE_ARGS \ - --prefix=$RUST_INSTALL_DIR \ - --sysconfdir=etc \ - --enable-lld \ - --llvm-libunwind=in-tree \ - --enable-extended \ - --disable-docs \ - --set target.x86_64-unknown-fuchsia.cc=/usr/local/bin/clang \ - --set target.x86_64-unknown-fuchsia.cxx=/usr/local/bin/clang++ \ - --set target.x86_64-unknown-fuchsia.ar=/usr/local/bin/llvm-ar \ - --set target.x86_64-unknown-fuchsia.ranlib=/usr/local/bin/llvm-ranlib \ - --set target.x86_64-unknown-fuchsia.linker=/usr/local/bin/ld.lld -ENV SCRIPT \ - 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 diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh b/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh deleted file mode 100755 index e6d7eabf4e7..00000000000 --- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env bash - -# Downloads and builds the Fuchsia operating system using a toolchain installed -# in $RUST_INSTALL_DIR. -# -# You may run this script locally using Docker with the following command: -# -# $ src/ci/docker/run.sh x86_64-gnu-integration -# -# Alternatively, from within the container with --dev, assuming you have made it -# as far as building the toolchain with the above command: -# -# $ src/ci/docker/run.sh --dev x86_64-gnu-integration -# docker# git config --global --add safe.directory /checkout/obj/fuchsia -# docker# ../src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh -# -# Also see the docs in the rustc-dev-guide for more info: -# https://github.com/rust-lang/rustc-dev-guide/pull/1989 - -set -euf -o pipefail - -# 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 -# `obj/x86_64-gnu-integration/fuchsia` in your local checkout after running this -# job for the first time. -KEEP_CHECKOUT= - -# Any upstream refs that should be cherry-picked. This can be used to include -# Gerrit changes from https://fxrev.dev during development (click the "Download" -# button on a changelist to see the cherry pick ref). Example: -# PICK_REFS=(refs/changes/71/1054071/2 refs/changes/74/1054574/2) -PICK_REFS=() - -# The commit hash of Fuchsia's integration.git to check out. This controls the -# commit hash of fuchsia.git and some other repos in the "monorepo" checkout, in -# addition to versions of prebuilts. It should be bumped regularly by the -# Fuchsia team – we aim for every 1-2 months. -INTEGRATION_SHA=d1d2f20efe46e22be179953dd6726c96eced54ab - -checkout=fuchsia -jiri=.jiri_root/bin/jiri - -set -x - -if [ -z "$KEEP_CHECKOUT" ]; then - # This script will: - # - create a directory named "fuchsia" if it does not exist - # - download "jiri" to "fuchsia/.jiri_root/bin" - curl -s "https://fuchsia.googlesource.com/jiri/+/HEAD/scripts/bootstrap_jiri?format=TEXT" \ - | base64 --decode \ - | bash -s $checkout - - cd $checkout - - $jiri init \ - -partial=true \ - -analytics-opt=false \ - . - - $jiri import \ - -name=integration \ - -revision=$INTEGRATION_SHA \ - -overwrite=true \ - flower \ - "https://fuchsia.googlesource.com/integration" - - if [ -d ".git" ]; then - # Wipe out any local changes if we're reusing a checkout. - git checkout --force JIRI_HEAD - fi - - $jiri update -autoupdate=false - - echo integration commit = $(git -C integration rev-parse HEAD) - - for git_ref in "${PICK_REFS[@]}"; do - git fetch https://fuchsia.googlesource.com/fuchsia $git_ref - git cherry-pick --no-commit FETCH_HEAD - done -else - echo Reusing existing Fuchsia checkout - cd $checkout -fi - -# Run the script inside the Fuchsia checkout responsible for building Fuchsia. -# You can change arguments to the build by setting KEEP_CHECKOUT=1 above and -# modifying them in build_fuchsia_from_rust_ci.sh. -bash scripts/rust/build_fuchsia_from_rust_ci.sh diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index e3903c3dd5a..cf750bbd0c5 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -208,6 +208,13 @@ auto: - image: test-various <<: *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 <<: *job-linux-4c @@ -229,13 +236,6 @@ auto: - image: x86_64-gnu-aux <<: *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 <<: *job-linux-4c -- cgit 1.4.1-3-g733a5 From 64b3492c30eaa3a963ed87a3c306f2cb29baa5b5 Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Sat, 29 Jun 2024 13:51:50 +0200 Subject: Rename Rust for Linux CI job to make its name clearer --- src/ci/docker/host-x86_64/rfl/Dockerfile | 40 ---------------------- .../host-x86_64/x86_64-rust-for-linux/Dockerfile | 40 ++++++++++++++++++++++ src/ci/github-actions/jobs.yml | 10 +++--- 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 src/ci/docker/host-x86_64/rfl/Dockerfile create mode 100644 src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile (limited to 'src/ci/github-actions') diff --git a/src/ci/docker/host-x86_64/rfl/Dockerfile b/src/ci/docker/host-x86_64/rfl/Dockerfile deleted file mode 100644 index 97298519cf2..00000000000 --- a/src/ci/docker/host-x86_64/rfl/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM ubuntu:22.04 - -ARG DEBIAN_FRONTEND=noninteractive - -# libclang1 is required for libclang.so, required by bindgen -# clang, llvm and lld is required by RfL to compile host code -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - ninja-build \ - file \ - curl \ - ca-certificates \ - python3 \ - git \ - cmake \ - flex \ - bison \ - bc \ - clang-15 \ - libclang1-15 \ - llvm-15 \ - lld-15 \ - libelf-dev \ - libedit-dev \ - libssl-dev \ - pkg-config \ - zlib1g-dev \ - && rm -rf /var/lib/apt/lists/* - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -# RfL needs access to cland, lld and llvm tools -ENV PATH="${PATH}:/usr/lib/llvm-15/bin" - -ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu - -COPY /scripts/rfl-build.sh /tmp/rfl-build.sh -ENV SCRIPT bash /tmp/rfl-build.sh diff --git a/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile new file mode 100644 index 00000000000..97298519cf2 --- /dev/null +++ b/src/ci/docker/host-x86_64/x86_64-rust-for-linux/Dockerfile @@ -0,0 +1,40 @@ +FROM ubuntu:22.04 + +ARG DEBIAN_FRONTEND=noninteractive + +# libclang1 is required for libclang.so, required by bindgen +# clang, llvm and lld is required by RfL to compile host code +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++ \ + make \ + ninja-build \ + file \ + curl \ + ca-certificates \ + python3 \ + git \ + cmake \ + flex \ + bison \ + bc \ + clang-15 \ + libclang1-15 \ + llvm-15 \ + lld-15 \ + libelf-dev \ + libedit-dev \ + libssl-dev \ + pkg-config \ + zlib1g-dev \ + && rm -rf /var/lib/apt/lists/* + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# RfL needs access to cland, lld and llvm tools +ENV PATH="${PATH}:/usr/lib/llvm-15/bin" + +ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu + +COPY /scripts/rfl-build.sh /tmp/rfl-build.sh +ENV SCRIPT bash /tmp/rfl-build.sh diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index cf750bbd0c5..a6e12c6ff95 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -215,6 +215,11 @@ auto: only_on_channel: nightly <<: *job-linux-8c + # Tests integration with Rust for Linux. + # Builds stage 1 compiler and tries to compile a few RfL examples with it. + - image: x86_64-rust-for-linux + <<: *job-linux-8c + - image: x86_64-gnu <<: *job-linux-4c @@ -465,8 +470,3 @@ auto: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-extended --enable-profiler SCRIPT: python x.py dist bootstrap --include-default-paths <<: *job-windows-8c - - # Tests integration with Rust for Linux. - # Builds stage 1 compiler and tries to compile a few RfL examples with it. - - image: rfl - <<: *job-linux-8c -- cgit 1.4.1-3-g733a5 From 410f760ed530954a3f3da66b41207833207efdf2 Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Thu, 4 Jul 2024 12:34:07 +0200 Subject: Make CI more agnostic of the owning GitHub organization This should make it possible to switch running `auto` and `try` builds from `rust-lang-ci` to `rust-lang`. --- src/ci/docker/run.sh | 3 +-- src/ci/github-actions/calculate-job-matrix.py | 14 +++++--------- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'src/ci/github-actions') diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index a4c59b3067e..695b8b4c0d9 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -93,8 +93,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then docker --version REGISTRY=ghcr.io - # PR CI runs on rust-lang, but we want to use the cache from rust-lang-ci - REGISTRY_USERNAME=rust-lang-ci + REGISTRY_USERNAME=${GITHUB_REPOSITORY_OWNER} # Tag used to push the final Docker image, so that it can be pulled by e.g. rustup IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci:${cksum} # Tag used to cache the Docker build diff --git a/src/ci/github-actions/calculate-job-matrix.py b/src/ci/github-actions/calculate-job-matrix.py index 4f9bc39a628..d03bbda1008 100755 --- a/src/ci/github-actions/calculate-job-matrix.py +++ b/src/ci/github-actions/calculate-job-matrix.py @@ -91,21 +91,17 @@ def find_run_type(ctx: GitHubCtx) -> Optional[WorkflowRunType]: if ctx.event_name == "pull_request": return PRRunType() elif ctx.event_name == "push": - old_bors_try_build = ( - ctx.ref in ("refs/heads/try", "refs/heads/try-perf") and - ctx.repository == "rust-lang-ci/rust" + try_build = ctx.ref in ( + "refs/heads/try", + "refs/heads/try-perf", + "refs/heads/automation/bors/try" ) - new_bors_try_build = ( - ctx.ref == "refs/heads/automation/bors/try" and - ctx.repository == "rust-lang/rust" - ) - try_build = old_bors_try_build or new_bors_try_build if try_build: jobs = get_custom_jobs(ctx) return TryRunType(custom_jobs=jobs) - if ctx.ref == "refs/heads/auto" and ctx.repository == "rust-lang-ci/rust": + if ctx.ref == "refs/heads/auto": return AutoRunType() return None -- cgit 1.4.1-3-g733a5