mirror of
https://github.com/phil-opp/blog_os.git
synced 2025-12-16 06:17:49 +00:00
Merge branch 'post-01' into post-02
This commit is contained in:
@@ -19,21 +19,21 @@ environment:
|
||||
|
||||
### MSVC Toolchains ###
|
||||
# Nightly 64-bit MSVC
|
||||
- channel: nightly
|
||||
- channel: stable
|
||||
target: x86_64-pc-windows-msvc
|
||||
MSYS_BITS: 64
|
||||
# Nightly 32-bit MSVC
|
||||
- channel: nightly
|
||||
- channel: stable
|
||||
target: i686-pc-windows-msvc
|
||||
MSYS_BITS: 32
|
||||
|
||||
### GNU Toolchains ###
|
||||
# Nightly 64-bit GNU
|
||||
- channel: nightly
|
||||
- channel: stable
|
||||
target: x86_64-pc-windows-gnu
|
||||
MSYS_BITS: 64
|
||||
# Nightly 32-bit GNU
|
||||
- channel: nightly
|
||||
- channel: stable
|
||||
target: i686-pc-windows-gnu
|
||||
MSYS_BITS: 32
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
language: rust
|
||||
|
||||
rust:
|
||||
- nightly
|
||||
- stable
|
||||
|
||||
os:
|
||||
- linux
|
||||
|
||||
@@ -17,7 +17,7 @@ strategy:
|
||||
matrix:
|
||||
linux:
|
||||
image_name: 'ubuntu-16.04'
|
||||
rustup_toolchain: nightly
|
||||
rustup_toolchain: stable
|
||||
mac:
|
||||
image_name: 'macos-10.13'
|
||||
rustup_toolchain: nightly
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
nightly
|
||||
Reference in New Issue
Block a user