Skip to content

Commit a7409e9

Browse files
borsbors
committed
Auto merge of #2225 - JohnTitor:wasi, r=<try>
[Do Not Merge] Experimental CI testing for WASI r? `@ghost`
2 parents 3df6aaa + 14fe8d4 commit a7409e9

File tree

3 files changed

+2
-316
lines changed

3 files changed

+2
-316
lines changed

‎.github/workflows/bors.yml

+1-248
Original file line numberDiff line numberDiff line change
@@ -7,86 +7,9 @@ on:
77
- try
88

99
jobs:
10-
docker_linux_tier1:
11-
name: Docker Linux Tier1
12-
runs-on: ubuntu-20.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: Self-update rustup
76-
run: rustup self update
77-
shell: bash
78-
- name: Setup Rust toolchain
79-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
80-
shell: bash
81-
- name: Execute run.sh
82-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
83-
shell: bash
84-
8510
style_check:
8611
name: Style check
8712
runs-on: ubuntu-20.04
88-
strategy:
89-
fail-fast: true
9013
steps:
9114
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
9215
with:
@@ -99,46 +22,13 @@ jobs:
9922

10023
docker_linux_tier2:
10124
name: Docker Linux Tier2
102-
needs: [docker_linux_tier1, style_check]
10325
runs-on: ubuntu-20.04
10426
strategy:
10527
fail-fast: true
10628
max-parallel: 12
10729
matrix:
10830
target: [
109-
# FIXME: Mysterious failures in CI, see
110-
# https://github.com/rust-lang/libc/issues/2081
111-
# aarch64-linux-android,
112-
aarch64-unknown-linux-gnu,
113-
aarch64-unknown-linux-musl,
114-
arm-linux-androideabi,
115-
arm-unknown-linux-gnueabihf,
116-
arm-unknown-linux-musleabihf,
117-
asmjs-unknown-emscripten,
118-
i686-linux-android,
119-
i686-unknown-linux-musl,
120-
mips-unknown-linux-gnu,
121-
mips-unknown-linux-musl,
122-
# FIXME: Somehow failed on CI
123-
# https://github.com/rust-lang/libc/runs/1659882216
124-
# mips64-unknown-linux-gnuabi64,
125-
# mips64el-unknown-linux-gnuabi64,
126-
mipsel-unknown-linux-musl,
127-
powerpc-unknown-linux-gnu,
128-
powerpc64-unknown-linux-gnu,
129-
powerpc64le-unknown-linux-gnu,
130-
s390x-unknown-linux-gnu,
131-
riscv64gc-unknown-linux-gnu,
132-
# FIXME: Figure out why this is disabled.
133-
#wasm32-wasi,
134-
sparc64-unknown-linux-gnu,
135-
wasm32-unknown-emscripten,
136-
x86_64-linux-android,
137-
x86_64-unknown-linux-gnux32,
138-
x86_64-unknown-linux-musl,
139-
# FIXME: It seems some items in `src/unix/mod.rs`
140-
# aren't defined on redox actually.
141-
# x86_64-unknown-redox,
31+
wasm32-wasi,
14232
]
14333
steps:
14434
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
@@ -150,129 +40,6 @@ jobs:
15040
- name: Execute run-docker.sh
15141
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
15242

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

29858
steps:
@@ -304,15 +64,8 @@ jobs:
30464
if: github.event.pusher.name == 'bors' && (failure() || cancelled())
30565
runs-on: ubuntu-20.04
30666
needs: [
307-
docker_linux_tier1,
30867
docker_linux_tier2,
309-
macos,
310-
windows,
31168
style_check,
312-
docker_switch,
313-
build_channels_linux,
314-
build_channels_macos,
315-
docs,
31669
]
31770

31871
steps:

‎.github/workflows/main.yml

-68
Original file line numberDiff line numberDiff line change
@@ -8,77 +8,9 @@ on:
88
- master
99

1010
jobs:
11-
docker_linux_tier1:
12-
name: Docker Linux Tier1
13-
runs-on: ubuntu-20.04
14-
strategy:
15-
fail-fast: true
16-
matrix:
17-
target: [
18-
i686-unknown-linux-gnu,
19-
x86_64-unknown-linux-gnu,
20-
]
21-
steps:
22-
- uses: actions/checkout@v2
23-
- name: Setup Rust toolchain
24-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
25-
- name: Execute run-docker.sh
26-
run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
27-
28-
macos:
29-
name: macOS
30-
runs-on: macos-10.15
31-
strategy:
32-
fail-fast: true
33-
matrix:
34-
target: [
35-
x86_64-apple-darwin,
36-
]
37-
steps:
38-
- uses: actions/checkout@v2
39-
- name: Setup Rust toolchain
40-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
41-
- name: Execute run.sh
42-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
43-
44-
windows:
45-
name: Windows
46-
runs-on: windows-2019
47-
env:
48-
OS: windows
49-
strategy:
50-
fail-fast: true
51-
matrix:
52-
include:
53-
- target: x86_64-pc-windows-gnu
54-
env:
55-
ARCH_BITS: 64
56-
ARCH: x86_64
57-
- target: x86_64-pc-windows-msvc
58-
# Disabled because broken:
59-
# https://github.com/rust-lang/libc/issues/1592
60-
#- target: i686-pc-windows-gnu
61-
# env:
62-
# ARCH_BITS: 32
63-
# ARCH: i686
64-
- target: i686-pc-windows-msvc
65-
steps:
66-
- uses: actions/checkout@v2
67-
- name: Self-update rustup
68-
run: rustup self update
69-
shell: bash
70-
- name: Setup Rust toolchain
71-
run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
72-
shell: bash
73-
- name: Execute run.sh
74-
run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
75-
shell: bash
76-
7711
style_check:
7812
name: Style check
7913
runs-on: ubuntu-20.04
80-
strategy:
81-
fail-fast: true
8214
steps:
8315
- uses: actions/checkout@v2
8416
- name: Setup Rust toolchain

‎ci/docker/wasm32-wasi/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ENV PATH=$PATH:/wasmtime-dev-x86_64-linux
2626
COPY docker/wasm32-wasi/clang.sh /wasi-libc/bin/clang
2727

2828
RUN apt-get install -y --no-install-recommends lld
29+
RUN ln -s /usr/bin/wasm-ld-10 /usr/bin/wasm-ld
2930
ENV PATH=$PATH:/usr/lib/llvm-9/bin
3031

3132
# Of note here is our clang wrapper which just executes a normal clang

0 commit comments

Comments
 (0)