From 016684a5865a52a1371a7a30c0d1a43e66d4db81 Mon Sep 17 00:00:00 2001
From: Ryan Dahl <ry@tinyclouds.org>
Date: Thu, 24 May 2018 13:47:05 -0400
Subject: [PATCH] Try to fix travis

---
 .travis.yml  | 15 +++++++++------
 package.json |  3 ++-
 yarn.lock    |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c826159a38..580679bf6f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,14 @@ env:
 before_install: |
   if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
     # protoc
-    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
+    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
   fi
 install:
  - mkdir -p $HOME/.ccache
@@ -28,5 +30,6 @@ install:
  - go get -d github.com/ry/v8worker2
  - (cd $GOPATH/src/github.com/ry/v8worker2 && ./tools/build.py)
 script:
+ - yarn lint-version
  - make lint
  - make test
diff --git a/package.json b/package.json
index fd45f95687..d7e401ce21 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "name": "deno",
   "scripts": {
     "lint": "tslint -p tsconfig.json",
+    "lint-version": "tslint --version",
     "fmt": "prettier --write *.ts* *.js *.json"
   },
   "devDependencies": {
@@ -15,7 +16,7 @@
     "protobufjs": "^6.8.6",
     "source-map": "0.6.0",
     "tmp": "0.0.33",
-    "tslint": "^5.10.0",
+    "tslint": "5.10.0",
     "typescript": "^2.8.3",
     "uglify-js": "^2.8.29"
   },
diff --git a/yarn.lock b/yarn.lock
index caf9dd2259..a03d5cbc6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3598,7 +3598,7 @@ tslib@^1.8.0, tslib@^1.8.1:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
 
-tslint@^5.10.0:
+tslint@5.10.0:
   version "5.10.0"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.10.0.tgz#11e26bccb88afa02dd0d9956cae3d4540b5f54c3"
   dependencies: