Switch to LTS 14 and bump versions to 0.2.0.1 (tensorflow#248)

Greg Steuck · web-flow · commit 580917a731a2 · 2019-09-08T12:45:24.000-07:00
* Use newer stack and protoc in Dockerfiles
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -2,7 +2,8 @@
 
 ## v0.2.0.1
 - Switch to tensorflow 1.14.0.
-- Compatibility with stackage LTS-13.13.
+- Compatibility with stackage LTS-14.4.
+- Switch to proto-lens 0.4.
 
 ## v0.2.0.0
 - Switch to tensorflow 1.9.
diff --git a/ci_build/Dockerfile b/ci_build/Dockerfile
@@ -30,11 +30,11 @@ RUN \
         netbase \
         && \
     # Installs stack.
-    curl -O -L https://github.com/commercialhaskell/stack/releases/download/v1.7.1/stack-1.7.1-linux-x86_64.tar.gz && \
-    tar zxf stack-1.7.1-linux-x86_64.tar.gz -C /usr/local/bin stack-1.7.1-linux-x86_64/stack --strip 1 && \
+    curl -O -L https://github.com/commercialhaskell/stack/releases/download/v2.1.3/stack-2.1.3-linux-x86_64.tar.gz && \
+    tar zxf stack-2.1.3-linux-x86_64.tar.gz -C /usr/local/bin stack-2.1.3-linux-x86_64/stack --strip 1 && \
     # Installs protoc and the libraries.
-    curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \
-    unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
+    curl -O -L https://github.com/google/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \
+    unzip -d /usr/local protoc-3.9.1-linux-x86_64.zip bin/protoc && \
     chmod 755 /usr/local/bin/protoc && \
     curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz && \
     tar zxf libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -28,8 +28,8 @@ RUN dpkg-reconfigure locales && \
 
 # Installs protoc and the libraries.
 RUN \
-    curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \
-    unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
+    curl -O -L https://github.com/google/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \
+    unzip -d /usr/local protoc-3.9.1-linux-x86_64.zip bin/protoc && \
     chmod 755 /usr/local/bin/protoc && \
     curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz && \
     tar zxf libtensorflow-cpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \
diff --git a/docker/gpu/Dockerfile b/docker/gpu/Dockerfile
@@ -28,8 +28,8 @@ RUN dpkg-reconfigure locales && \
 
 # Installs protoc and the libraries.
 RUN \
-    curl -O -L https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip && \
-    unzip -d /usr/local protoc-3.2.0-linux-x86_64.zip bin/protoc && \
+    curl -O -L https://github.com/google/protobuf/releases/download/v3.9.1/protoc-3.9.1-linux-x86_64.zip && \
+    unzip -d /usr/local protoc-3.9.1-linux-x86_64.zip bin/protoc && \
     chmod 755 /usr/local/bin/protoc && \
     curl -O https://storage.googleapis.com/tensorflow/libtensorflow/libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz && \
     tar zxf libtensorflow-gpu-linux-x86_64-1.14.0.tar.gz -C /usr/local && \
diff --git a/stack.yaml b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-13.13
+resolver: lts-14.4
 
 packages:
 - tensorflow
diff --git a/tensorflow-core-ops/tensorflow-core-ops.cabal b/tensorflow-core-ops/tensorflow-core-ops.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow-core-ops
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            Haskell wrappers for Core Tensorflow Ops.
 description:         Code generated signatures for the Ops in libtensorflow.
 homepage:            https://github.com/tensorflow/haskell#readme
diff --git a/tensorflow-logging/tensorflow-logging.cabal b/tensorflow-logging/tensorflow-logging.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow-logging
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            TensorBoard related functionality.
 description:         Please see README.md
 homepage:            https://github.com/tensorflow/haskell#readme
diff --git a/tensorflow-opgen/tensorflow-opgen.cabal b/tensorflow-opgen/tensorflow-opgen.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow-opgen
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            Code generation for TensorFlow operations.
 description:         Please see README.md
 homepage:            https://github.com/tensorflow/haskell#readme
diff --git a/tensorflow-ops/tensorflow-ops.cabal b/tensorflow-ops/tensorflow-ops.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow-ops
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            Friendly layer around TensorFlow bindings.
 description:         Please see README.md
 homepage:            https://github.com/tensorflow/haskell#readme
diff --git a/tensorflow-proto/tensorflow-proto.cabal b/tensorflow-proto/tensorflow-proto.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow-proto
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            TensorFlow protocol buffers.
 description:         Please see README.md
 homepage:            https://github.com/tensorflow/haskell#readme
diff --git a/tensorflow/tensorflow.cabal b/tensorflow/tensorflow.cabal
@@ -1,5 +1,5 @@
 name:                tensorflow
-version:             0.2.0.0
+version:             0.2.0.1
 synopsis:            TensorFlow bindings.
 description:
     This library provides an interface to the TensorFlow

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-resolver: lts-13.13`
	`1`	`+resolver: lts-14.4`
`2`	`2`
`3`	`3`	`packages:`
`4`	`4`	`- tensorflow`