Merge branch 'post-01' into post-02

This commit is contained in:
Philipp Oppermann
2019-02-07 16:11:46 +01:00
4 changed files with 6 additions and 7 deletions

View File

@@ -19,21 +19,21 @@ environment:
### MSVC Toolchains ### ### MSVC Toolchains ###
# Nightly 64-bit MSVC # Nightly 64-bit MSVC
- channel: nightly - channel: stable
target: x86_64-pc-windows-msvc target: x86_64-pc-windows-msvc
MSYS_BITS: 64 MSYS_BITS: 64
# Nightly 32-bit MSVC # Nightly 32-bit MSVC
- channel: nightly - channel: stable
target: i686-pc-windows-msvc target: i686-pc-windows-msvc
MSYS_BITS: 32 MSYS_BITS: 32
### GNU Toolchains ### ### GNU Toolchains ###
# Nightly 64-bit GNU # Nightly 64-bit GNU
- channel: nightly - channel: stable
target: x86_64-pc-windows-gnu target: x86_64-pc-windows-gnu
MSYS_BITS: 64 MSYS_BITS: 64
# Nightly 32-bit GNU # Nightly 32-bit GNU
- channel: nightly - channel: stable
target: i686-pc-windows-gnu target: i686-pc-windows-gnu
MSYS_BITS: 32 MSYS_BITS: 32

View File

@@ -1,7 +1,7 @@
language: rust language: rust
rust: rust:
- nightly - stable
os: os:
- linux - linux

View File

@@ -17,7 +17,7 @@ strategy:
matrix: matrix:
linux: linux:
image_name: 'ubuntu-16.04' image_name: 'ubuntu-16.04'
rustup_toolchain: nightly rustup_toolchain: stable
mac: mac:
image_name: 'macos-10.13' image_name: 'macos-10.13'
rustup_toolchain: nightly rustup_toolchain: nightly

View File

@@ -1 +0,0 @@
nightly