openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mhe...@apache.org
Subject [openwhisk-runtime-go] branch master updated: go upgrade (#103)
Date Mon, 26 Aug 2019 08:37:53 GMT
This is an automated email from the ASF dual-hosted git repository.

mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-go.git


The following commit(s) were added to refs/heads/master by this push:
     new 429932e  go upgrade (#103)
429932e is described below

commit 429932eec167b1fec50372ada75b90178a851291
Author: Michele Sciabarra <30654959+sciabarracom@users.noreply.github.com>
AuthorDate: Mon Aug 26 10:37:49 2019 +0200

    go upgrade (#103)
    
    * go upgrade
    
    * enable go modules
    
    * no more realpath in images
---
 .travis.yml             | 2 +-
 CHANGES.md              | 1 +
 actionloop/build.gradle | 1 +
 docs/BUILD.md           | 5 ++---
 golang1.11/Dockerfile   | 5 ++---
 golang1.11/build.gradle | 1 +
 golang1.12/Dockerfile   | 5 ++---
 golang1.12/build.gradle | 1 +
 tools/travis/setup.sh   | 6 ------
 9 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c056115..1438f62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@
 sudo: required
 language: go
 go:
-  - "1.11.6"
+  - "1.12.9"
 services:
   - docker
 notifications:
diff --git a/CHANGES.md b/CHANGES.md
index d52c7d9..66fc0c9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -39,3 +39,4 @@ ActionLoop for Scripting Languages
 # Deincubation
 - Removed the -incubation
 - Now all runtimes use source release so no more actionloop-v2, renamed to actionloop-base
+- upgraded to go 1.12.9 and 1.11.13
diff --git a/actionloop/build.gradle b/actionloop/build.gradle
index 27b1966..44ddc10 100644
--- a/actionloop/build.gradle
+++ b/actionloop/build.gradle
@@ -25,6 +25,7 @@ task staticBuildProxy(type: Exec) {
 	environment CGO_ENABLED: "0"
 	environment GOOS: "linux"
 	environment GOARCH: "amd64"
+	environment GO111MODULE: "on"
 
 	commandLine 'go', 'build',
 		'-o',  'proxy', '-a',
diff --git a/docs/BUILD.md b/docs/BUILD.md
index 397fdb3..dd8b8e4 100644
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -65,10 +65,9 @@ Then you need a set of utilities used in tests:
 
 - bc
 - zip
-- realpath
 
-Linux: `apt-get install bc zip realpath`
-OSX: `brew install zip coreutils`
+Linux: `apt-get install bc zip`
+OSX: `brew install zip`
 
 **NOTE**: Because tests build and cache some binary files, perform a `git clean -fx` and
**do not share folders between linux and osx** because binaries are in different format...
 
diff --git a/golang1.11/Dockerfile b/golang1.11/Dockerfile
index e5fd676..aabdb99 100644
--- a/golang1.11/Dockerfile
+++ b/golang1.11/Dockerfile
@@ -14,14 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM golang:1.11.6
+FROM golang:1.11.13
 RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" \
      >>/etc/apt/sources.list &&\
     apt-get update && apt-get install -y \
      curl \
      jq \
-     git \
-     realpath &&\
+     git &&\
     apt-get -y install \
      librdkafka1=0.11.6-1~bpo9+1 \
      librdkafka++1=0.11.6-1~bpo9+1 && \
diff --git a/golang1.11/build.gradle b/golang1.11/build.gradle
index 04c8064..92bbb7a 100644
--- a/golang1.11/build.gradle
+++ b/golang1.11/build.gradle
@@ -27,6 +27,7 @@ task staticBuildProxy(type: Exec) {
 	environment CGO_ENABLED: "0"
 	environment GOOS: "linux"
 	environment GOARCH: "amd64"
+    environment GO111MODULE: "on"
 
 	commandLine 'go', 'build',
 		'-o',  'proxy', '-a',
diff --git a/golang1.12/Dockerfile b/golang1.12/Dockerfile
index 6a9d711..6ccf0f9 100644
--- a/golang1.12/Dockerfile
+++ b/golang1.12/Dockerfile
@@ -14,14 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM golang:1.12.4
+FROM golang:1.12.9
 RUN echo "deb http://deb.debian.org/debian stretch-backports main contrib non-free" \
      >>/etc/apt/sources.list &&\
     apt-get update && apt-get install -y \
      curl \
      jq \
-     git \
-     realpath &&\
+     git &&\
     apt-get -y install \
      librdkafka1=0.11.6-1~bpo9+1 \
      librdkafka++1=0.11.6-1~bpo9+1 && \
diff --git a/golang1.12/build.gradle b/golang1.12/build.gradle
index f5e0043..91b1636 100644
--- a/golang1.12/build.gradle
+++ b/golang1.12/build.gradle
@@ -27,6 +27,7 @@ task staticBuildProxy(type: Exec) {
 	environment CGO_ENABLED: "0"
 	environment GOOS: "linux"
 	environment GOARCH: "amd64"
+    environment GO111MODULE: "on"
 
 	commandLine 'go', 'build',
 		'-o',  'proxy', '-a',
diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh
index 7e1d1d1..87d061a 100755
--- a/tools/travis/setup.sh
+++ b/tools/travis/setup.sh
@@ -18,12 +18,6 @@
 
 set -e
 
-# add realpath
-if ! which realpath
-then sudo apt-get -y update
-     sudo apt-get -y install realpath
-fi
-
 # Build script for Travis-CI.
 
 SCRIPTDIR=$(cd $(dirname "$0") && pwd)


Mime
View raw message