Skip to content

Commit 21d39f0

Browse files
committed
Auto merge of rust-lang#119399 - tmandry:build-fuchsia-tests, r=<try>
Build Fuchsia tests in CI This would have caught rust-lang/rust-clippy#11952.
2 parents fb5ed72 + 97b9519 commit 21d39f0

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

.github/workflows/ci.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -579,10 +579,9 @@ jobs:
579579
strategy:
580580
matrix:
581581
include:
582-
- name: dist-x86_64-linux
583-
env:
584-
CODEGEN_BACKENDS: "llvm,cranelift"
582+
- name: x86_64-gnu-integration
585583
os: ubuntu-20.04-16core-64gb
584+
env: {}
586585
timeout-minutes: 600
587586
runs-on: "${{ matrix.os }}"
588587
steps:

src/ci/docker/host-x86_64/x86_64-gnu-integration/build-fuchsia.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
set -euf -o pipefail
77

88
INTEGRATION_SHA=66793c4894bf6204579bbee3b79956335f31c768
9-
PICK_REFS=()
9+
PICK_REFS=(
10+
refs/changes/86/965586/2
11+
)
1012

1113
checkout=fuchsia
1214
jiri=.jiri_root/bin/jiri

src/ci/github-actions/ci.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -732,11 +732,13 @@ jobs:
732732
strategy:
733733
matrix:
734734
include:
735-
- &dist-x86_64-linux
736-
name: dist-x86_64-linux
737-
env:
738-
CODEGEN_BACKENDS: llvm,cranelift
735+
- name: x86_64-gnu-integration
739736
<<: *job-linux-16c
737+
#- &dist-x86_64-linux
738+
# name: dist-x86_64-linux
739+
# env:
740+
# CODEGEN_BACKENDS: llvm,cranelift
741+
# <<: *job-linux-16c
740742

741743

742744
master:

0 commit comments

Comments
 (0)