1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 03:27:44 +00:00

Merge pull request #1180 from Arcterus/master

Allow build to fail on Redox
This commit is contained in:
Alex Lyon 2018-04-18 14:50:28 -07:00 committed by GitHub
commit eff423d5f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View file

@ -1,5 +1,6 @@
language: rust language: rust
matrix: matrix:
fast_finish: true
include: include:
- rust: stable - rust: stable
os: linux os: linux
@ -22,6 +23,10 @@ matrix:
- rust: nightly - rust: nightly
os: linux os: linux
env: FEATURES=nightly,redox CC=x86_64-unknown-redox-gcc CARGO_ARGS='--no-default-features --target=x86_64-unknown-redox' REDOX=1 env: FEATURES=nightly,redox CC=x86_64-unknown-redox-gcc CARGO_ARGS='--no-default-features --target=x86_64-unknown-redox' REDOX=1
allow_failures:
- rust: nightly
os: linux
env: FEATURES=nightly,redox CC=x86_64-unknown-redox-gcc CARGO_ARGS='--no-default-features --target=x86_64-unknown-redox' REDOX=1
cache: cache:
directories: directories:

View file

@ -19,13 +19,13 @@ environment:
MSYS_BITS: 64 MSYS_BITS: 64
install: install:
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
- SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\MinGW\bin - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin;C:\MinGW\bin
# Use the system msys if we can # Use the system msys if we can
- if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH% - if defined MSYS_BITS set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
- ps: >- - ps: >-
Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe";
if ((Test-Path Env:\MINGW_ARCHIVE) -and -not (Test-Path "${env:DIR_TEMP_MINGW}\${env:MINGW_ARCHIVE}")) { if ((Test-Path Env:\MINGW_ARCHIVE) -and -not (Test-Path "${env:DIR_TEMP_MINGW}\${env:MINGW_ARCHIVE}")) {
if (Test-Path "${env:DIR_TEMP_MINGW}") { if (Test-Path "${env:DIR_TEMP_MINGW}") {
rm -Recurse ${env:DIR_TEMP_MINGW}\*; rm -Recurse ${env:DIR_TEMP_MINGW}\*;