From 0779a5ce2f83ee87664e08aade0300570ffb074a Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Mon, 24 Aug 2020 12:37:32 -0400 Subject: [PATCH] Allow CI fail on Windows Nightly, for now --- .github/workflows/ci.yml | 35 ++++++++++++++--------------------- bors.toml | 4 +--- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60cd72c44..a89b2fbfb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,48 +44,41 @@ jobs: strategy: fail-fast: false matrix: - name: - [ - MacOS Stable, - MacOS Nightly, - Ubuntu Stable, - Ubuntu Nightly, - Windows Stable, - Windows Nightly, - ] + os: [macos-10.15, ubuntu-18.04, windows-2019] + channel: [stable, nightly] include: - - os: macos-10.15 - name: MacOS Stable + - name: MacOS Stable channel: stable + os: macos-10.15 build_command: cargo clippy additional_core_features: trace additional_player_features: winit - - os: macos-10.15 - name: MacOS Nightly + - name: MacOS Nightly + os: macos-10.15 channel: nightly build_command: cargo test additional_core_features: additional_player_features: - - os: ubuntu-18.04 - name: Ubuntu Stable + - name: Ubuntu Stable + os: ubuntu-18.04 channel: stable build_command: cargo clippy additional_core_features: trace,replay additional_player_features: - - os: ubuntu-18.04 - name: Ubuntu Nightly + - name: Ubuntu Nightly + os: ubuntu-18.04 channel: nightly build_command: cargo test additional_core_features: serial-pass additional_player_features: winit - - os: windows-2019 - name: Windows Stable + - name: Windows Stable + os: windows-2019 channel: stable build_command: rustup default stable-msvc; cargo clippy additional_core_features: trace,serial-pass additional_player_features: renderdoc - - os: windows-2019 - name: Windows Nightly + - name: Windows Nightly + os: windows-2019 channel: nightly build_command: rustup default nightly-msvc; cargo test additional_core_features: diff --git a/bors.toml b/bors.toml index f83b5282a..38ac9b451 100644 --- a/bors.toml +++ b/bors.toml @@ -6,7 +6,5 @@ status = [ "Ubuntu Stable", "Ubuntu Nightly", "Windows Stable", - "Windows Nightly", + #"Windows Nightly", ] - -timeout_sec = 18000 # 5 hours