Skip to content

Commit

Permalink
Tweak CI for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnTitor committed Apr 1, 2021
1 parent 27aa964 commit e4b700a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 75 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/bors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Docker Linux Tier1
runs-on: ubuntu-20.04
strategy:
fail-fast: true
fail-fast: false
matrix:
target: [
i686-unknown-linux-gnu,
Expand All @@ -31,7 +31,7 @@ jobs:
name: macOS
runs-on: macos-10.15
strategy:
fail-fast: true
fail-fast: false
matrix:
target: [
x86_64-apple-darwin,
Expand All @@ -52,7 +52,7 @@ jobs:
env:
OS: windows
strategy:
fail-fast: true
fail-fast: false
matrix:
include:
- target: x86_64-pc-windows-gnu
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
name: Style check
runs-on: ubuntu-20.04
strategy:
fail-fast: true
fail-fast: false
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
Expand All @@ -99,7 +99,7 @@ jobs:
needs: [docker_linux_tier1, style_check]
runs-on: ubuntu-20.04
strategy:
fail-fast: true
fail-fast: false
max-parallel: 12
matrix:
target: [
Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
needs: [docker_linux_tier1, style_check]
runs-on: ubuntu-20.04
strategy:
fail-fast: true
fail-fast: false
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
Expand All @@ -171,7 +171,7 @@ jobs:
env:
OS: linux
strategy:
fail-fast: true
fail-fast: false
max-parallel: 5
matrix:
toolchain: [
Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
env:
OS: macos
strategy:
fail-fast: true
fail-fast: false
max-parallel: 4
matrix:
toolchain: [
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
runs-on: ubuntu-20.04
continue-on-error: true
strategy:
fail-fast: true
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
Expand All @@ -245,7 +245,7 @@ jobs:
runs-on: macos-10.15
continue-on-error: true
strategy:
fail-fast: true
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
Expand All @@ -259,7 +259,7 @@ jobs:
runs-on: ubuntu-20.04
needs: docker_linux_tier2
strategy:
fail-fast: true
fail-fast: false
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@master
with:
Expand Down
65 changes: 1 addition & 64 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,74 +8,11 @@ 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: 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
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Setup Rust toolchain
Expand Down

0 comments on commit e4b700a

Please sign in to comment.