浏览代码

modifies environment var settings in matrix build, modifies testing dependency installs on OS X platform

Chris Simpkins 7 年之前
父节点
当前提交
0a5a19e6d4
共有 1 个文件被更改,包括 7 次插入5 次删除
  1. 7 5
      .travis.yml

+ 7 - 5
.travis.yml

@@ -1,14 +1,13 @@
 sudo: true
 sudo: true
 language: generic
 language: generic
 
 
-env:
-  - TARGET="lint"
-  - TARGET="build-with-dependencies"
-
 matrix:
 matrix:
   include:
   include:
     - os: linux
     - os: linux
       sudo: required
       sudo: required
+      env:
+        - TARGET="lint"
+        - TARGET="build-with-dependencies"
       before_script:
       before_script:
         - pip install ufolint
         - pip install ufolint
         - sudo apt-get -qq update
         - sudo apt-get -qq update
@@ -16,6 +15,9 @@ matrix:
       script:
       script:
         - make -j $TARGET
         - make -j $TARGET
     - os: osx
     - os: osx
+      env:
+        - TARGET="lint"
+        - TARGET="build-with-dependencies"
       before_install:
       before_install:
         - brew update
         - brew update
         - brew install python3
         - brew install python3
@@ -23,7 +25,7 @@ matrix:
         - source env/bin/activate
         - source env/bin/activate
       before_script:
       before_script:
         - pip install ufolint
         - pip install ufolint
-        - brew outdated shellcheck || brew upgrade shellcheck
+        - brew install shellcheck
       script:
       script:
         - make -j $TARGET
         - make -j $TARGET