From cd8471acaee8eb342d6d0fd06b872068f2e01a4c Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Thu, 7 Mar 2019 15:17:18 +0100
Subject: [PATCH] all: support Go 1.12

---
 .circleci/config.yml | 31 ++++++++++++++++++++++---------
 Gopkg.lock           |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4bfd5acc..a0cc3bd9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -66,19 +66,15 @@ commands:
       - run: tinygo build -size short -o test.elf -target=pca10056            examples/blinky2
       - run: tinygo build -size short -o test.elf -target=itsybitsy-m0        examples/blinky1
       - run: tinygo build -size short -o test.elf -target=circuitplay-express examples/blinky1
-
-
-jobs:
-  test-llvm8-go111:
-    docker:
-      - image: circleci/golang:1.11
-
-    working_directory: /go/src/github.com/tinygo-org/tinygo
+  test-linux:
+    parameters:
+      llvm:
+        type: string
     steps:
       - checkout
       - submodules
       - apt-dependencies:
-          llvm: "-8"
+          llvm: <<parameters.llvm>>
       - install-node
       - restore_cache:
           keys:
@@ -95,7 +91,24 @@ jobs:
             - ~/.cache/go-build
             - ~/.cache/tinygo
 
+jobs:
+  test-llvm8-go111:
+    docker:
+      - image: circleci/golang:1.11
+    working_directory: /go/src/github.com/tinygo-org/tinygo
+    steps:
+      - test-linux:
+          llvm: "-8"
+  test-llvm8-go112:
+    docker:
+      - image: circleci/golang:1.12
+    working_directory: /go/src/github.com/tinygo-org/tinygo
+    steps:
+      - test-linux:
+          llvm: "-8"
+
 workflows:
   test-all:
     jobs:
       - test-llvm8-go111
+      - test-llvm8-go112
diff --git a/Gopkg.lock b/Gopkg.lock
index bb576945..4cf9b0f8 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -19,7 +19,7 @@
     "go/types/typeutil",
   ]
   pruneopts = "UT"
-  revision = "3744606dbb67b99c60d3f11cb10bd3f9e6dad472"
+  revision = "8dcc6e70cdefe9a82236b6e195e4f4e2108fcb9f"
 
 [[projects]]
   branch = "llvm8"