From 4ceedb372c45213a0d946840748cef92752dca24 Mon Sep 17 00:00:00 2001
From: Kris Kwiatkowski <contact@amongbytes.com>
Date: Thu, 5 Mar 2020 10:27:32 +0000
Subject: [PATCH] support go 1.14

NOBS now supports Go 1.14 for
* x86-64
* ARM
---
 .travis.yml                                   | 21 ++++++++++++++-----
 .../{Dockerfile => Dockerfile_1_13}           |  6 +++---
 .../debian-buster-aarch64/Dockerfile_1_14     | 11 ++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)
 rename etc/dockers/debian-buster-aarch64/{Dockerfile => Dockerfile_1_13} (56%)
 create mode 100644 etc/dockers/debian-buster-aarch64/Dockerfile_1_14

diff --git a/.travis.yml b/.travis.yml
index 2d41b83..4bb3cc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ sudo: required
 language: go
 go:
   - 1.13.x
+  - 1.14.x
   - master
 
 matrix:
@@ -12,15 +13,25 @@ matrix:
         - make clean
         - NOASM=0 make test
         - NOASM=1 make test
-        - NOASM=0 make cover
-        - NOASM=1 make cover
-    - name: "Go on ARM64"
+    - name: "Go 1.13 on ARM64"
       services: docker
       os: linux
       script:
         - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go" /bin/bash -c "NOASM=0 make test"
-        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go" /bin/bash -c "NOASM=1 make test"
+        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go-1.13" /bin/bash -c "NOASM=0 make test"
+        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go-1.13" /bin/bash -c "NOASM=1 make test"
+    - name: "Go 1.14 on ARM64"
+      services: docker
+      os: linux
+      script:
+        - docker run --rm --privileged multiarch/qemu-user-static:register --reset
+        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go-1.14" /bin/bash -c "NOASM=0 make test"
+        - docker run --rm -v `pwd`:`pwd` -w `pwd` "flowher/debian-buster-aarch64-go-1.14" /bin/bash -c "NOASM=1 make test"
+    - name: "Coverage"
+      os: linux
+      script:
+        - NOASM=0 make cover
+        - NOASM=1 make cover
 
 
 after_script:
diff --git a/etc/dockers/debian-buster-aarch64/Dockerfile b/etc/dockers/debian-buster-aarch64/Dockerfile_1_13
similarity index 56%
rename from etc/dockers/debian-buster-aarch64/Dockerfile
rename to etc/dockers/debian-buster-aarch64/Dockerfile_1_13
index c690d9d..3bc6795 100644
--- a/etc/dockers/debian-buster-aarch64/Dockerfile
+++ b/etc/dockers/debian-buster-aarch64/Dockerfile_1_13
@@ -4,8 +4,8 @@ RUN apt-get upgrade -y
 RUN apt-get update -qq
 USER root
 RUN apt-get install -y make wget ca-certificates
-RUN wget https://dl.google.com/go/go1.12.5.linux-arm64.tar.gz
-RUN tar -xzf go1.12.5.linux-arm64.tar.gz
+RUN wget https://dl.google.com/go/go1.13.linux-arm64.tar.gz
+RUN tar -xzf go1.13.linux-arm64.tar.gz
 RUN mv go /usr/local/
 RUN ln -s /usr/local/go/bin/go /usr/bin/
-RUN rm -rf /var/lib/apt/lists/* go1.12.5.linux-arm64.tar.gz
+RUN rm -rf /var/lib/apt/lists/* go1.13.linux-arm64.tar.gz
diff --git a/etc/dockers/debian-buster-aarch64/Dockerfile_1_14 b/etc/dockers/debian-buster-aarch64/Dockerfile_1_14
new file mode 100644
index 0000000..518f3d7
--- /dev/null
+++ b/etc/dockers/debian-buster-aarch64/Dockerfile_1_14
@@ -0,0 +1,11 @@
+FROM multiarch/debian-debootstrap:arm64-buster
+
+RUN apt-get upgrade -y
+RUN apt-get update -qq
+USER root
+RUN apt-get install -y make wget ca-certificates
+RUN wget https://dl.google.com/go/go1.14.linux-arm64.tar.gz
+RUN tar -xzf go1.14.linux-arm64.tar.gz
+RUN mv go /usr/local/
+RUN ln -s /usr/local/go/bin/go /usr/bin/
+RUN rm -rf /var/lib/apt/lists/* go1.14.linux-arm64.tar.gz