From 7448970ea8965d6fb5e6607c3e33fc24a4ee4c9f Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sun, 2 Aug 2020 05:42:37 -0400
Subject: [PATCH 4/4] Allow Go 1.15.
Signed-off-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
---
.circleci/config.yml | 7 +++++++
builder/config.go | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4988610..f419178 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -333,6 +333,12 @@ jobs:
steps:
- test-linux:
llvm: "10"
+ test-llvm10-go115:
+ docker:
+ - image: circleci/golang:1.15-rc-buster
+ steps:
+ - test-linux:
+ llvm: "10"
assert-test-linux:
docker:
- image: circleci/golang:1.14-stretch
@@ -359,6 +365,7 @@ workflows:
- test-llvm10-go112
- test-llvm10-go113
- test-llvm10-go114
+ - test-llvm10-go115
- build-linux
- build-macos
- assert-test-linux
diff --git a/builder/config.go b/builder/config.go
index aabf82a..b0d262e 100644
--- a/builder/config.go
+++ b/builder/config.go
@@ -25,8 +25,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
if err != nil {
return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
}
- if major != 1 || minor < 11 || minor > 14 {
- return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, or 1.14, got go%d.%d", major, minor)
+ if major != 1 || minor < 11 || minor > 15 {
+ return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, 1.14, or 1.15, got go%d.%d", major, minor)
}
clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
return &compileopts.Config{
--
2.25.4