servo: Merge #13383 - Appveyor and Travis fix (from UK992:ci); r=jdm
authorUK992 <urbankrajnc92@gmail.com>
Fri, 23 Sep 2016 11:11:13 -0500
changeset 339736 934656c311016ab142cbbd4775c11eb3295c5f21
parent 339735 3a063011d8523c40e0e145c594cbd016ddc8514a
child 339737 1a9a96410c21983894f9e523c37246b91ffe903d
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjdm
servo: Merge #13383 - Appveyor and Travis fix (from UK992:ci); r=jdm Fixes https://github.com/servo/servo/issues/13340 Source-Repo: https://github.com/servo/servo Source-Revision: 4cb4e38d382a02d5cabd2c9a0f073780bd8a2a1f
servo/.travis.yml
servo/appveyor.yml
--- a/servo/.travis.yml
+++ b/servo/.travis.yml
@@ -7,20 +7,20 @@ matrix:
       script:
          - ./mach test-tidy --no-progress --all
          - ./mach test-tidy --no-progress --self-test
       cache: false
     - sudo: 9000
       dist: trusty
       script:
          - ./mach build -d --verbose
+         - ./mach test-compiletest
+         - ./mach test-unit
          - ./mach build-geckolib
          - ./mach test-geckolib
-         - ./mach test-unit
-         - ./mach test-compiletest
          - bash etc/ci/check_no_unwrap.sh
          - bash etc/ci/lockfile_changed.sh
          - bash etc/ci/manifest_changed.sh
       cache:
         directories:
           - .cargo
           - .servo
           - $HOME/.ccache
--- a/servo/appveyor.yml
+++ b/servo/appveyor.yml
@@ -1,13 +1,12 @@
 version: 1.0.{build}
 
 environment:
   RUST_BACKTRACE: 1
-  HOME: '%APPVEYOR_BUILD_FOLDER%'
   # 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
   PATH: "C:\\windows\\system32;\
     C:\\windows;\
     C:\\windows\\System32\\Wbem;\
     C:\\windows\\System32\\WindowsPowerShell\\v1.0;\
     C:\\ProgramData\\chocolatey\\bin;\
     C:\\Python27;\
@@ -64,11 +63,11 @@ install:
 #init:
 #  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 #
 #on_finish:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 build_script:
   - 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