Skip to content

Commit f55f1c5

Browse files
committed
debug
1 parent a7a03b8 commit f55f1c5

File tree

2 files changed

+12
-113
lines changed

2 files changed

+12
-113
lines changed

.github/workflows/bors.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,27 @@ on:
77
- try
88

99
jobs:
10-
docker_linux_tier2:
11-
name: Docker Linux Tier2
10+
build_channels_linux:
11+
name: Build Channels Linux
1212
runs-on: ubuntu-18.04
13+
env:
14+
OS: linux
1315
strategy:
1416
fail-fast: true
15-
max-parallel: 12
17+
max-parallel: 5
1618
matrix:
17-
target: [
18-
mips64-unknown-linux-gnuabi64,
19-
mips64el-unknown-linux-gnuabi64,
19+
toolchain: [
20+
nightly,
2021
]
2122
steps:
2223
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
2324
with:
2425
github_token: "${{ secrets.GITHUB_TOKEN }}"
2526
- uses: actions/checkout@v2
2627
- name: Setup Rust toolchain
27-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
28-
- name: Execute run-docker.sh
29-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
28+
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
29+
- name: Execute build.sh
30+
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
3031

3132
# These jobs doesn't actually test anything, but they're only used to tell
3233
# bors the build completed, as there is no practical way to detect when a
@@ -39,7 +40,7 @@ jobs:
3940
if: github.event.pusher.name == 'bors' && success()
4041
runs-on: ubuntu-18.04
4142
needs: [
42-
docker_linux_tier2,
43+
build_channels_linux,
4344
]
4445

4546
steps:
@@ -51,7 +52,7 @@ jobs:
5152
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
5253
runs-on: ubuntu-18.04
5354
needs: [
54-
docker_linux_tier2,
55+
build_channels_linux,
5556
]
5657

5758
steps:

ci/build.sh

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -90,67 +90,21 @@ test_target() {
9090
}
9191

9292
RUST_LINUX_TARGETS="\
93-
aarch64-linux-android \
94-
aarch64-unknown-linux-gnu \
95-
arm-linux-androideabi \
96-
arm-unknown-linux-gnueabi \
97-
arm-unknown-linux-gnueabihf \
98-
armv7-linux-androideabi \
99-
armv7-unknown-linux-gnueabihf \
100-
i586-unknown-linux-gnu \
101-
i686-linux-android \
102-
i686-unknown-freebsd \
103-
i686-unknown-linux-gnu \
104-
i686-unknown-linux-musl \
105-
mips-unknown-linux-gnu \
106-
mips-unknown-linux-musl \
10793
mips64-unknown-linux-gnuabi64 \
10894
mips64el-unknown-linux-gnuabi64 \
109-
mipsel-unknown-linux-gnu \
110-
mipsel-unknown-linux-musl \
111-
powerpc-unknown-linux-gnu \
112-
powerpc64-unknown-linux-gnu \
113-
powerpc64le-unknown-linux-gnu \
114-
s390x-unknown-linux-gnu \
115-
x86_64-unknown-freebsd \
116-
x86_64-unknown-linux-gnu \
117-
x86_64-unknown-linux-musl \
118-
x86_64-unknown-netbsd \
11995
"
12096

12197
RUST_GT_1_13_LINUX_TARGETS="\
122-
arm-unknown-linux-musleabi \
123-
arm-unknown-linux-musleabihf \
124-
armv7-unknown-linux-musleabihf \
125-
sparc64-unknown-linux-gnu \
126-
wasm32-unknown-emscripten \
127-
x86_64-linux-android \
128-
x86_64-rumprun-netbsd \
12998
"
13099
RUST_GT_1_19_LINUX_TARGETS="\
131-
aarch64-unknown-linux-musl \
132-
sparcv9-sun-solaris \
133-
wasm32-unknown-unknown \
134-
x86_64-sun-solaris \
135100
"
136101
RUST_GT_1_24_LINUX_TARGETS="\
137-
i586-unknown-linux-musl \
138102
"
139103

140104
# FIXME: temporarirly disable the redox target
141105
# https://github.com/rust-lang/libc/issues/1457
142106
# x86_64-unknown-redox
143107
RUST_NIGHTLY_LINUX_TARGETS="\
144-
aarch64-fuchsia \
145-
armv5te-unknown-linux-gnueabi \
146-
armv5te-unknown-linux-musleabi \
147-
i686-pc-windows-gnu \
148-
riscv64gc-unknown-linux-gnu \
149-
wasm32-wasi \
150-
x86_64-fortanix-unknown-sgx \
151-
x86_64-fuchsia \
152-
x86_64-pc-windows-gnu \
153-
x86_64-unknown-linux-gnux32 \
154108
"
155109

156110
RUST_OSX_TARGETS="\
@@ -196,62 +150,6 @@ done
196150
# FIXME: https://github.com/rust-lang/rust/issues/58564
197151
# sparc-unknown-linux-gnu
198152
RUST_LINUX_NO_CORE_TARGETS="\
199-
aarch64-pc-windows-msvc \
200-
aarch64-unknown-cloudabi \
201-
aarch64-unknown-freebsd \
202-
aarch64-unknown-hermit \
203-
aarch64-unknown-netbsd \
204-
aarch64-unknown-openbsd \
205-
armebv7r-none-eabi \
206-
armebv7r-none-eabihf \
207-
armv7-unknown-cloudabi-eabihf \
208-
armv7r-none-eabi \
209-
armv7r-none-eabihf \
210-
hexagon-unknown-linux-musl \
211-
i586-pc-windows-msvc \
212-
i686-pc-windows-msvc \
213-
i686-unknown-cloudabi \
214-
i686-unknown-haiku \
215-
i686-unknown-netbsd \
216-
i686-unknown-openbsd \
217-
mips-unknown-linux-uclibc \
218-
mipsel-sony-psp \
219-
mipsel-unknown-linux-uclibc \
220-
mips64-unknown-linux-muslabi64 \
221-
mips64el-unknown-linux-muslabi64 \
222-
nvptx64-nvidia-cuda \
223-
powerpc-unknown-linux-gnuspe \
224-
powerpc-unknown-netbsd \
225-
powerpc64-unknown-freebsd \
226-
riscv32i-unknown-none-elf \
227-
riscv32imac-unknown-none-elf \
228-
riscv32imc-unknown-none-elf \
229-
riscv32gc-unknown-linux-gnu \
230-
riscv64gc-unknown-none-elf \
231-
riscv64imac-unknown-none-elf \
232-
sparc64-unknown-netbsd \
233-
234-
thumbv6m-none-eabi \
235-
thumbv7em-none-eabi \
236-
thumbv7em-none-eabihf \
237-
thumbv7m-none-eabi \
238-
thumbv7neon-linux-androideabi \
239-
thumbv7neon-unknown-linux-gnueabihf \
240-
thumbv8m.main-none-eabi \
241-
x86_64-pc-windows-msvc \
242-
x86_64-unknown-cloudabi \
243-
x86_64-unknown-dragonfly \
244-
x86_64-unknown-haiku \
245-
x86_64-unknown-hermit \
246-
x86_64-unknown-l4re-uclibc \
247-
x86_64-unknown-openbsd \
248-
armv7-wrs-vxworks-eabihf \
249-
aarch64-wrs-vxworks \
250-
i686-wrs-vxworks \
251-
x86_64-wrs-vxworks \
252-
powerpc-wrs-vxworks \
253-
powerpc-wrs-vxworks-spe \
254-
powerpc64-wrs-vxworks \
255153
"
256154

257155
if [ "${RUST}" = "nightly" ] && [ "${OS}" = "linux" ]; then

0 commit comments

Comments
 (0)