Auto merge of #2225 - JohnTitor:wasi, r=<try>

[Do Not Merge] Experimental CI testing for WASI r? `@ghost`
rust-lang · Jun 9, 2021 · a7409e9 · a7409e9
2 parents 3df6aaa + 14fe8d4
commit a7409e9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 316 deletions.
diff --git a/.github/workflows/bors.yml b/.github/workflows/bors.yml
@@ -7,86 +7,9 @@ on:
       - try
 
 jobs:
-  docker_linux_tier1:
-    name: Docker Linux Tier1
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          i686-unknown-linux-gnu,
-          x86_64-unknown-linux-gnu,
-        ]
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
-
-  macos:
-    name: macOS
-    runs-on: macos-10.15
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          x86_64-apple-darwin,
-        ]
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-      - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
-
-  windows:
-    name: Windows
-    runs-on: windows-2019
-    env:
-      OS: windows
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - target: x86_64-pc-windows-gnu
-            env:
-              ARCH_BITS: 64
-              ARCH: x86_64
-          - target: x86_64-pc-windows-msvc
-          # Disabled because broken:
-          #  https://github.com/rust-lang/libc/issues/1592
-          #- target: i686-pc-windows-gnu
-          #  env:
-          #    ARCH_BITS: 32
-          #    ARCH: i686
-          - target: i686-pc-windows-msvc
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Self-update rustup
-        run: rustup self update
-        shell: bash
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-        shell: bash
-      - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
-        shell: bash
-
   style_check:
     name: Style check
     runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
         with:
@@ -99,46 +22,13 @@ jobs:
 
   docker_linux_tier2:
     name: Docker Linux Tier2
-    needs: [docker_linux_tier1, style_check]
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: true
       max-parallel: 12
       matrix:
         target: [
-          # FIXME: Mysterious failures in CI, see
-          # https://github.com/rust-lang/libc/issues/2081
-          # aarch64-linux-android,
-          aarch64-unknown-linux-gnu,
-          aarch64-unknown-linux-musl,
-          arm-linux-androideabi,
-          arm-unknown-linux-gnueabihf,
-          arm-unknown-linux-musleabihf,
-          asmjs-unknown-emscripten,
-          i686-linux-android,
-          i686-unknown-linux-musl,
-          mips-unknown-linux-gnu,
-          mips-unknown-linux-musl,
-          # FIXME: Somehow failed on CI
-          # https://github.com/rust-lang/libc/runs/1659882216
-          # mips64-unknown-linux-gnuabi64,
-          # mips64el-unknown-linux-gnuabi64,
-          mipsel-unknown-linux-musl,
-          powerpc-unknown-linux-gnu,
-          powerpc64-unknown-linux-gnu,
-          powerpc64le-unknown-linux-gnu,
-          s390x-unknown-linux-gnu,
-          riscv64gc-unknown-linux-gnu,
-          # FIXME: Figure out why this is disabled.
-          #wasm32-wasi,
-          sparc64-unknown-linux-gnu,
-          wasm32-unknown-emscripten,
-          x86_64-linux-android,
-          x86_64-unknown-linux-gnux32,
-          x86_64-unknown-linux-musl,
-          # FIXME: It seems some items in `src/unix/mod.rs`
-          # aren't defined on redox actually.
-          # x86_64-unknown-redox,
+          wasm32-wasi,
         ]
     steps:
       - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
@@ -150,129 +40,6 @@ jobs:
       - name: Execute run-docker.sh
         run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
 
-  # devkitpro's pacman needs to be connected from Docker.
-  docker_switch:
-    name: Docker Switch
-    needs: [docker_linux_tier1, style_check]
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh switch
-
-  build_channels_linux:
-    name: Build Channels Linux
-    needs: docker_linux_tier2
-    runs-on: ubuntu-20.04
-    env:
-      OS: linux
-    strategy:
-      fail-fast: true
-      max-parallel: 5
-      matrix:
-        toolchain: [
-          stable,
-          beta,
-          nightly,
-          1.13.0,
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-        ]
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
-      - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
-
-  build_channels_macos:
-    name: Build Channels macOS
-    needs: macos
-    runs-on: macos-10.15
-    env:
-      OS: macos
-    strategy:
-      fail-fast: true
-      max-parallel: 4
-      matrix:
-        toolchain: [
-          stable,
-          beta,
-          nightly,
-          1.13.0,
-          1.19.0,
-          1.24.0,
-          1.25.0,
-          1.30.0,
-        ]
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/install-rust.sh
-      - name: Execute build.sh
-        run: LIBC_CI=1 TOOLCHAIN=${{ matrix.toolchain }} sh ./ci/build.sh
-
-  semver_linux:
-    name: Semver Linux
-    needs: build_channels_linux
-    runs-on: ubuntu-20.04
-    continue-on-error: true
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        # Should update the semverver revision in semver.sh if we touch nightly ver.
-        run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
-      - name: Check breaking changes
-        run: sh ci/semver.sh linux
-
-  semver_macos:
-    name: Semver macOS
-    needs: build_channels_macos
-    runs-on: macos-10.15
-    continue-on-error: true
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        # FIXME: Pin nightly version to make semverver compilable.
-        run: TOOLCHAIN=nightly-2020-11-19 sh ./ci/install-rust.sh
-      - name: Check breaking changes
-        run: sh ci/semver.sh macos
-
-  docs:
-    name: Generate documentation
-    runs-on: ubuntu-20.04
-    needs: docker_linux_tier2
-    strategy:
-      fail-fast: true
-    steps:
-      - uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
-        with:
-          github_token: "${{ secrets.GITHUB_TOKEN }}"
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: sh ./ci/install-rust.sh
-      - name: Generate documentation
-        run: LIBC_CI=1 sh ci/dox.sh
-
   # These jobs doesn't actually test anything, but they're only used to tell
   # bors the build completed, as there is no practical way to detect when a
   # workflow is successful listening to webhooks only.
@@ -284,15 +51,8 @@ jobs:
     if: github.event.pusher.name == 'bors' && success()
     runs-on: ubuntu-20.04
     needs: [
-      docker_linux_tier1,
       docker_linux_tier2,
-      macos,
-      windows,
       style_check,
-      docker_switch,
-      build_channels_linux,
-      build_channels_macos,
-      docs,
     ]
 
     steps:
@@ -304,15 +64,8 @@ jobs:
     if: github.event.pusher.name == 'bors' && (failure() || cancelled())
     runs-on: ubuntu-20.04
     needs: [
-      docker_linux_tier1,
       docker_linux_tier2,
-      macos,
-      windows,
       style_check,
-      docker_switch,
-      build_channels_linux,
-      build_channels_macos,
-      docs,
     ]
 
     steps:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -8,77 +8,9 @@ on:
       - master
 
 jobs:
-  docker_linux_tier1:
-    name: Docker Linux Tier1
-    runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          i686-unknown-linux-gnu,
-          x86_64-unknown-linux-gnu,
-        ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-      - name: Execute run-docker.sh
-        run: LIBC_CI=1 sh ./ci/run-docker.sh ${{ matrix.target }}
-
-  macos:
-    name: macOS
-    runs-on: macos-10.15
-    strategy:
-      fail-fast: true
-      matrix:
-        target: [
-          x86_64-apple-darwin,
-        ]
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-      - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
-
-  windows:
-    name: Windows
-    runs-on: windows-2019
-    env:
-      OS: windows
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - target: x86_64-pc-windows-gnu
-            env:
-              ARCH_BITS: 64
-              ARCH: x86_64
-          - target: x86_64-pc-windows-msvc
-          # Disabled because broken:
-          #  https://github.com/rust-lang/libc/issues/1592
-          #- target: i686-pc-windows-gnu
-          #  env:
-          #    ARCH_BITS: 32
-          #    ARCH: i686
-          - target: i686-pc-windows-msvc
-    steps:
-      - uses: actions/checkout@v2
-      - name: Self-update rustup
-        run: rustup self update
-        shell: bash
-      - name: Setup Rust toolchain
-        run: TARGET=${{ matrix.target }} sh ./ci/install-rust.sh
-        shell: bash
-      - name: Execute run.sh
-        run: LIBC_CI=1 sh ./ci/run.sh ${{ matrix.target }}
-        shell: bash
-
   style_check:
     name: Style check
     runs-on: ubuntu-20.04
-    strategy:
-      fail-fast: true
     steps:
       - uses: actions/checkout@v2
       - name: Setup Rust toolchain

diff --git a/ci/docker/wasm32-wasi/Dockerfile b/ci/docker/wasm32-wasi/Dockerfile
@@ -26,6 +26,7 @@ ENV PATH=$PATH:/wasmtime-dev-x86_64-linux
 COPY docker/wasm32-wasi/clang.sh /wasi-libc/bin/clang
 
 RUN apt-get install -y --no-install-recommends lld
+RUN ln -s /usr/bin/wasm-ld-10 /usr/bin/wasm-ld
 ENV PATH=$PATH:/usr/lib/llvm-9/bin
 
 # Of note here is our clang wrapper which just executes a normal clang