Browse Source

Merge pull request #117 from chemidy/travis

Travis + docker update
Tim Burks 7 years ago
parent
commit
4f41d4ddc4
3 changed files with 5 additions and 5 deletions
  1. 2 2
      .travis-install.sh
  2. 2 2
      DOCKER.md
  3. 1 1
      Plugin/Package.swift

+ 2 - 2
.travis-install.sh

@@ -30,13 +30,13 @@ mkdir -p local
 
 
 # Install swift
-SWIFT_URL=https://swift.org/builds/swift-4.0-branch/ubuntu1404/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-09-01-a/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-09-01-a-ubuntu14.04.tar.gz
+SWIFT_URL=https://swift.org/builds/swift-4.0-branch/ubuntu1404/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-12-04-a/swift-4.0-DEVELOPMENT-SNAPSHOT-2017-12-04-a-ubuntu14.04.tar.gz
 echo $SWIFT_URL
 curl -fSsL $SWIFT_URL -o swift.tar.gz 
 tar -xzf swift.tar.gz --strip-components=2 --directory=local
 
 # Install protoc
-PROTOC_URL=https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
+PROTOC_URL=https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip
 echo $PROTOC_URL
 curl -fSsL $PROTOC_URL -o protoc.zip
 unzip protoc.zip -d local

+ 2 - 2
DOCKER.md

@@ -62,8 +62,8 @@ Start a docker instance with the swiftdocker image:
 
     # install protoc
     cd
-    curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0rc2/protoc-3.2.0rc2-linux-x86_64.zip
-    unzip protoc-3.2.0rc2-linux-x86_64.zip -d /usr
+    curl -O -L https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip
+    unzip protoc-3.5.1-linux-x86_64.zip -d /usr
     # build the Swift gRPC plugin
     cd
     cd grpc-swift/Plugin

+ 1 - 1
Plugin/Package.swift

@@ -26,6 +26,6 @@ let package = Package(
   ],
   dependencies: [
     .Package(url: "https://github.com/apple/swift-protobuf.git", Version(1,0,2)),
-    .Package(url: "https://github.com/kylef/Stencil.git", Version(0,9,0))
+    .Package(url: "https://github.com/kylef/Stencil.git", Version(0,10,1))
   ]
 )