Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build Fuchsia on 8 cores instead of 16 #119400

Closed
wants to merge 4 commits into from
Closed

Build Fuchsia on 8 cores instead of 16 #119400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6637351
Build Fuchsia on 8 cores instead of 16
tmandry Dec 29, 2023
d681495
Run integration in @bors try
tmandry Dec 29, 2023
9df1313
Build Fuchsia tests in CI
tmandry Dec 29, 2023
530b0ca
Skip building cranelift for Fuchsia
tmandry Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,10 +579,9 @@ jobs:
strategy:
matrix:
include:
- name: dist-x86_64-linux
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
- name: x86_64-gnu-integration
os: ubuntu-20.04-8core-32gb
env: {}
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
4 changes: 4 additions & 0 deletions src/ci/docker/host-x86_64/x86_64-gnu-integration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,17 @@ 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

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 \
Expand Down
4 changes: 3 additions & 1 deletion src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions src/ci/github-actions/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ jobs:
# nightly features to compile, and this job would fail if
# executed on beta and stable.
CI_ONLY_WHEN_CHANNEL: nightly
<<: *job-linux-16c
<<: *job-linux-8c

- name: x86_64-gnu-debug
<<: *job-linux-8c
Expand Down Expand Up @@ -732,11 +732,13 @@ jobs:
strategy:
matrix:
include:
- &dist-x86_64-linux
name: dist-x86_64-linux
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c
- name: x86_64-gnu-integration
<<: *job-linux-8c
#- &dist-x86_64-linux
# name: dist-x86_64-linux
# env:
# CODEGEN_BACKENDS: llvm,cranelift
# <<: *job-linux-16c


master:
Expand Down
4 changes: 2 additions & 2 deletions src/ci/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading