Try to fix travis

denoland · May 25, 2018 · 8eeeded · 8eeeded
1 parent 08e005d
commit 8eeeded
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,23 +12,22 @@ env:
     - USE_CCACHE=1
     - PROTOBUF_ROOT=$HOME/protobuf
 before_install: |
-  if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
-    # protoc
-    if [ -d $PROTOBUF_ROOT ]; then
-      mkdir -p $PROTOBUF_ROOT
-      pushd $PROTOBUF_ROOT
-      wget https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip
-      unzip protoc-3.1.0-linux-x86_64.zip
-      popd
-      export PATH=$PROTOBUF_ROOT/bin:$PATH
-    fi
+  export PATH=$PROTOBUF_ROOT/bin:$PATH
+  if ! [ -x $PROTOBUF_ROOT/bin/protoc ]; then
+    rm -rf $PROTOBUF_ROOT
+    mkdir -p $PROTOBUF_ROOT
+    pushd $PROTOBUF_ROOT
+    wget https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip
+    unzip protoc-3.1.0-linux-x86_64.zip
+    popd
   fi
 install:
  - mkdir -p $HOME/.ccache
  - export PATH=/usr/lib/ccache:$PATH
  - go get -u github.com/jteeuwen/go-bindata/...
  - go get -d github.com/ry/v8worker2
  - (cd $GOPATH/src/github.com/ry/v8worker2 && ./tools/build.py)
+ - yarn
 script:
  - yarn lint-version
  - make lint