Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #13383 - UK992:ci, r=jdm

Browse source 
Appveyor and Travis fix

Fixes https://github.com/servo/servo/issues/13340

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13383)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-09-23 11:11:13 -05:00 • committed by GitHub
commit 4cb4e38d38
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -12,10 +12,10 @@ matrix:
dist: trusty dist: trusty
script: script:
- ./mach build -d --verbose - ./mach build -d --verbose
- ./mach test-compiletest
- ./mach test-unit
- ./mach build-geckolib - ./mach build-geckolib
- ./mach test-geckolib - ./mach test-geckolib
- ./mach test-unit
- ./mach test-compiletest
- bash etc/ci/check_no_unwrap.sh - bash etc/ci/check_no_unwrap.sh
- bash etc/ci/lockfile_changed.sh - bash etc/ci/lockfile_changed.sh
- bash etc/ci/manifest_changed.sh - bash etc/ci/manifest_changed.sh

3
appveyor.yml
View file

@ -2,7 +2,6 @@ version: 1.0.{build}
environment: environment:
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
HOME: '%APPVEYOR_BUILD_FOLDER%'
# The appveyor image we use has a pretty huge set of things installed... we make the # The appveyor image we use has a pretty huge set of things installed... we make the
# initial PATH something sane so we know what to expect # initial PATH something sane so we know what to expect
PATH: "C:\\windows\\system32;\ PATH: "C:\\windows\\system32;\
@ -69,6 +68,6 @@ install:
build_script: build_script:
- if %BUILD_ENV%==msvc mach build -d -v && mach test-unit - if %BUILD_ENV%==msvc mach build -d -v && mach test-unit
- if %BUILD_ENV%==gnu bash -lc "./mach build -d -v && ./mach test-unit" - if %BUILD_ENV%==gnu bash -lc "cd $APPVEYOR_BUILD_FOLDER; ./mach build -d -v && ./mach test-unit"
test: off test: off