Skip to content

Commit e644bcb

Browse files
borsbors
committed
Auto merge of #1930 - JohnTitor:i686-android, r=<try>
Revive `i686-linux-android` CI Fixes #1765
2 parents 926300a + 0bea7d4 commit e644bcb

File tree

2 files changed

+1
-349
lines changed

2 files changed

+1
-349
lines changed

‎.github/workflows/bors.yml

+1-265
Original file line numberDiff line numberDiff line change
@@ -7,132 +7,15 @@ on:
77
- try
88

99
jobs:
10-
docker_linux_tier1:
11-
name: Docker Linux Tier1
12-
runs-on: ubuntu-18.04
13-
strategy:
14-
fail-fast: true
15-
matrix:
16-
target: [
17-
i686-unknown-linux-gnu,
18-
x86_64-unknown-linux-gnu,
19-
]
20-
steps:
21-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
22-
with:
23-
github_token: "${{ secrets.GITHUB_TOKEN }}"
24-
- uses: actions/checkout@v2
25-
- name: Setup Rust toolchain
26-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
27-
- name: Execute run-docker.sh
28-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
29-
30-
macos:
31-
name: macOS
32-
runs-on: macos-10.15
33-
strategy:
34-
fail-fast: true
35-
matrix:
36-
target: [
37-
x86_64-apple-darwin,
38-
]
39-
steps:
40-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
41-
with:
42-
github_token: "${{ secrets.GITHUB_TOKEN }}"
43-
- uses: actions/checkout@v2
44-
- name: Setup Rust toolchain
45-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
46-
- name: Execute run.sh
47-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
48-
49-
windows:
50-
name: Windows
51-
runs-on: windows-2019
52-
env:
53-
OS: windows
54-
strategy:
55-
fail-fast: true
56-
matrix:
57-
include:
58-
- target: x86_64-pc-windows-gnu
59-
env:
60-
ARCH_BITS: 64
61-
ARCH: x86_64
62-
- target: x86_64-pc-windows-msvc
63-
# Disabled because broken:
64-
# https://github.com/rust-lang/libc/issues/1592
65-
#- target: i686-pc-windows-gnu
66-
# env:
67-
# ARCH_BITS: 32
68-
# ARCH: i686
69-
- target: i686-pc-windows-msvc
70-
steps:
71-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
72-
with:
73-
github_token: "${{ secrets.GITHUB_TOKEN }}"
74-
- uses: actions/checkout@v2
75-
- name: Setup Rust toolchain
76-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
77-
shell: bash
78-
- name: Execute run.sh
79-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
80-
shell: bash
81-
82-
style_check:
83-
name: Style check
84-
runs-on: ubuntu-18.04
85-
strategy:
86-
fail-fast: true
87-
steps:
88-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
89-
with:
90-
github_token: "${{ secrets.GITHUB_TOKEN }}"
91-
- uses: actions/checkout@v2
92-
- name: Setup Rust toolchain
93-
run: sh ./ci/install-rust.sh
94-
- name: Check style
95-
run: sh ci/style.sh
96-
9710
docker_linux_tier2:
9811
name: Docker Linux Tier2
99-
needs: [docker_linux_tier1, style_check]
10012
runs-on: ubuntu-18.04
10113
strategy:
10214
fail-fast: true
10315
max-parallel: 12
10416
matrix:
10517
target: [
106-
aarch64-linux-android,
107-
aarch64-unknown-linux-gnu,
108-
aarch64-unknown-linux-musl,
109-
arm-linux-androideabi,
110-
arm-unknown-linux-gnueabihf,
111-
arm-unknown-linux-musleabihf,
112-
# FIXME: Disabled because currently broken, see:
113-
# https://github.com/rust-lang/libc/issues/1591
114-
# asmjs-unknown-emscripten,
115-
# FIXME: Disabled due to https://github.com/rust-lang/libc/issues/1765
116-
# i686-linux-android,
117-
i686-unknown-linux-musl,
118-
mips-unknown-linux-gnu,
119-
mips-unknown-linux-musl,
120-
mips64-unknown-linux-gnuabi64,
121-
mips64el-unknown-linux-gnuabi64,
122-
mipsel-unknown-linux-musl,
123-
# FIXME: Figure out why this is disabled.
124-
#powerpc-unknown-linux-gnu,
125-
powerpc64-unknown-linux-gnu,
126-
powerpc64le-unknown-linux-gnu,
127-
s390x-unknown-linux-gnu,
128-
riscv64gc-unknown-linux-gnu,
129-
# FIXME: Figure out why this is disabled.
130-
#wasm32-wasi,
131-
sparc64-unknown-linux-gnu,
132-
wasm32-unknown-emscripten,
133-
x86_64-linux-android,
134-
x86_64-unknown-linux-gnux32,
135-
x86_64-unknown-linux-musl,
18+
i686-linux-android,
13619
]
13720
steps:
13821
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
@@ -144,133 +27,6 @@ jobs:
14427
- name: Execute run-docker.sh
14528
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
14629

147-
# devkitpro's pacman needs to be connected from Docker.
148-
docker_switch:
149-
name: Docker Switch
150-
needs: [docker_linux_tier1, style_check]
151-
runs-on: ubuntu-18.04
152-
strategy:
153-
fail-fast: true
154-
steps:
155-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
156-
with:
157-
github_token: "${{ secrets.GITHUB_TOKEN }}"
158-
- uses: actions/checkout@v2
159-
- name: Setup Rust toolchain
160-
run: sh ./ci/install-rust.sh
161-
- name: Execute run-docker.sh
162-
run: LIBC_CI=1 sh ./ci/run-docker.sh switch
163-
164-
build_channels_linux:
165-
name: Build Channels Linux
166-
needs: docker_linux_tier2
167-
runs-on: ubuntu-18.04
168-
env:
169-
OS: linux
170-
strategy:
171-
fail-fast: true
172-
max-parallel: 5
173-
matrix:
174-
toolchain: [
175-
stable,
176-
beta,
177-
nightly,
178-
1.13.0,
179-
1.19.0,
180-
1.24.0,
181-
1.25.0,
182-
1.30.0,
183-
]
184-
steps:
185-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
186-
with:
187-
github_token: "${{ secrets.GITHUB_TOKEN }}"
188-
- uses: actions/checkout@v2
189-
- name: Setup Rust toolchain
190-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
191-
- name: Execute build.sh
192-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
193-
194-
build_channels_macos:
195-
name: Build Channels macOS
196-
needs: macos
197-
runs-on: macos-10.15
198-
env:
199-
OS: macos
200-
strategy:
201-
fail-fast: true
202-
max-parallel: 4
203-
matrix:
204-
toolchain: [
205-
stable,
206-
beta,
207-
nightly,
208-
1.13.0,
209-
1.19.0,
210-
1.24.0,
211-
1.25.0,
212-
1.30.0,
213-
]
214-
steps:
215-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
216-
with:
217-
github_token: "${{ secrets.GITHUB_TOKEN }}"
218-
- uses: actions/checkout@v2
219-
- name: Setup Rust toolchain
220-
run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
221-
- name: Execute build.sh
222-
run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
223-
224-
semver_linux:
225-
name: Semver Linux
226-
needs: build_channels_linux
227-
runs-on: ubuntu-18.04
228-
strategy:
229-
fail-fast: true
230-
steps:
231-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
232-
with:
233-
github_token: "${{ secrets.GITHUB_TOKEN }}"
234-
- uses: actions/checkout@v2
235-
- name: Setup Rust toolchain
236-
# FIXME: Pin nightly version to make semverver compilable.
237-
run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh
238-
- name: Check breaking changes
239-
run: sh ci/semver.sh linux
240-
241-
semver_macos:
242-
name: Semver macOS
243-
needs: build_channels_macos
244-
runs-on: macos-10.15
245-
strategy:
246-
fail-fast: true
247-
steps:
248-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
249-
with:
250-
github_token: "${{ secrets.GITHUB_TOKEN }}"
251-
- uses: actions/checkout@v2
252-
- name: Setup Rust toolchain
253-
# FIXME: Pin nightly version to make semverver compilable.
254-
run: TOOLCHAIN=nightly-2020-06-18 sh ./ci/install-rust.sh
255-
- name: Check breaking changes
256-
run: sh ci/semver.sh macos
257-
258-
docs:
259-
name: Generate documentation
260-
runs-on: ubuntu-18.04
261-
needs: docker_linux_tier2
262-
strategy:
263-
fail-fast: true
264-
steps:
265-
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
266-
with:
267-
github_token: "${{ secrets.GITHUB_TOKEN }}"
268-
- uses: actions/checkout@v2
269-
- name: Setup Rust toolchain
270-
run: sh ./ci/install-rust.sh
271-
- name: Generate documentation
272-
run: LIBC_CI=1 sh ci/dox.sh
273-
27430
# These jobs doesn't actually test anything, but they're only used to tell
27531
# bors the build completed, as there is no practical way to detect when a
27632
# workflow is successful listening to webhooks only.
@@ -282,17 +38,7 @@ jobs:
28238
if: github.event.pusher.name == 'bors' && success()
28339
runs-on: ubuntu-18.04
28440
needs: [
285-
docker_linux_tier1,
28641
docker_linux_tier2,
287-
macos,
288-
windows,
289-
style_check,
290-
docker_switch,
291-
build_channels_linux,
292-
build_channels_macos,
293-
semver_linux,
294-
semver_macos,
295-
docs,
29642
]
29743

29844
steps:
@@ -304,17 +50,7 @@ jobs:
30450
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
30551
runs-on: ubuntu-18.04
30652
needs: [
307-
docker_linux_tier1,
30853
docker_linux_tier2,
309-
macos,
310-
windows,
311-
style_check,
312-
docker_switch,
313-
build_channels_linux,
314-
build_channels_macos,
315-
semver_linux,
316-
semver_macos,
317-
docs,
31854
]
31955

32056
steps:

‎.github/workflows/main.yml

-84
This file was deleted.

0 commit comments

Comments
 (0)