From 96a9df2b5217e920bbf06c8e24ef1b49b22d6255 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Thu, 28 Dec 2023 16:02:55 -0800 Subject: [PATCH 1/7] Build Fuchsia tests in CI This would have caught https://github.com/rust-lang/rust-clippy/issues/11952. --- src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile | 1 + .../host-x86_64/x86_64-gnu-integration/build-fuchsia.sh | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 index ba65ba9bed460..41934cab14c4c 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile @@ -44,6 +44,7 @@ ENV CARGO_TARGET_X86_64_FUCHSIA_RUSTFLAGS \ ENV TARGETS=x86_64-fuchsia ENV TARGETS=$TARGETS,x86_64-unknown-linux-gnu +ENV TARGETS=$TARGETS,wasm32-unknown-unknown COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.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 index 4a246f591d717..214411353f743 100755 --- 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 @@ -6,7 +6,9 @@ set -euf -o pipefail INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768 -PICK_REFS=() +PICK_REFS=( + refs/changes/86/965586/2 +) checkout=fuchsia jiri=.jiri_root/bin/jiri From 2340efa7fd280c4bdcc8c25262f1eacd19b5e885 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Thu, 28 Dec 2023 16:15:55 -0800 Subject: [PATCH 2/7] Run integration in @bors try --- .github/workflows/ci.yml | 5 ++--- src/ci/github-actions/ci.yml | 10 ++++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 540e1eb157e2f..2c599578be97d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -579,10 +579,9 @@ jobs: strategy: matrix: include: - - name: dist-x86_64-linux - env: - CODEGEN_BACKENDS: "llvm,cranelift" + - name: x86_64-gnu-integration os: ubuntu-20.04-16core-64gb + env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}" steps: diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 3af370bf006ad..af5e5bdc62387 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -732,11 +732,13 @@ jobs: strategy: matrix: include: - - &dist-x86_64-linux - name: dist-x86_64-linux - env: - CODEGEN_BACKENDS: llvm,cranelift + - name: x86_64-gnu-integration <<: *job-linux-16c + #- &dist-x86_64-linux + # name: dist-x86_64-linux + # env: + # CODEGEN_BACKENDS: llvm,cranelift + # <<: *job-linux-16c master: From 88026c2f587f4b055aae20f15f6ffc9beccbd025 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Thu, 28 Dec 2023 16:44:49 -0800 Subject: [PATCH 3/7] Skip building cranelift for Fuchsia --- src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile | 3 +++ src/ci/run.sh | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) 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 index 41934cab14c4c..bec1c89733775 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile @@ -52,6 +52,9 @@ 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 \ diff --git a/src/ci/run.sh b/src/ci/run.sh index 5700172fd3ec4..7ace4727a396d 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -130,10 +130,10 @@ else # tests as it will fail them. if [[ "${ENABLE_GCC_CODEGEN}" == "1" ]]; then # Test the Cranelift and GCC backends in CI. Bootstrap knows which targets to run tests on. - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift,gcc" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift,gcc}" else # Test the Cranelift backend in CI. Bootstrap knows which targets to run tests on. - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=llvm,cranelift" + RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-backends=${CODEGEN_BACKENDS:-llvm,cranelift}" fi # We enable this for non-dist builders, since those aren't trying to produce From 25f5f8f53c4c5a874c263f89f0419d7b1dd0c6ea Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Tue, 23 Jan 2024 17:39:40 -0500 Subject: [PATCH 4/7] Bump Fuchsia --- .../docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 214411353f743..fc5440d502a0a 100755 --- 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 @@ -5,7 +5,7 @@ set -euf -o pipefail -INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768 +INTEGRATION_SHA=ea080c6e400e721e123b0ec751c73619963bf1ca PICK_REFS=( refs/changes/86/965586/2 ) From ed3db055f97486247a75e8258fd32095e5600205 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Wed, 24 Jan 2024 18:09:51 -0500 Subject: [PATCH 5/7] Bump Fuchsia --- .../docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index fc5440d502a0a..d3a323c1b36c7 100755 --- 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 @@ -5,7 +5,7 @@ set -euf -o pipefail -INTEGRATION_SHA=ea080c6e400e721e123b0ec751c73619963bf1ca +INTEGRATION_SHA=8b634b0c1e80a829e46fe9cfa800a9ae72da8b56 PICK_REFS=( refs/changes/86/965586/2 ) From f7c26a47d1d0085645ce238ae5f9aa461d9da663 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Wed, 24 Jan 2024 19:43:25 -0500 Subject: [PATCH 6/7] Update patchset --- .../docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d3a323c1b36c7..554ae5a1a49bc 100755 --- 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 @@ -7,7 +7,7 @@ set -euf -o pipefail INTEGRATION_SHA=8b634b0c1e80a829e46fe9cfa800a9ae72da8b56 PICK_REFS=( - refs/changes/86/965586/2 + refs/changes/86/965586/9 ) checkout=fuchsia From 7e359e7aad17bf40dc184bfe6b45e68dfe0c1a00 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Wed, 24 Jan 2024 19:47:29 -0500 Subject: [PATCH 7/7] [try] Use 8 core bot for integration --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2c599578be97d..1297ef795a44c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -580,7 +580,7 @@ jobs: matrix: include: - name: x86_64-gnu-integration - os: ubuntu-20.04-16core-64gb + os: ubuntu-20.04-8core-32gb env: {} timeout-minutes: 600 runs-on: "${{ matrix.os }}"