diff options
| author | Elliott Sales de Andrade <[email protected]> | 2020-02-11 17:23:42 -0500 |
|---|---|---|
| committer | Ron Evans <[email protected]> | 2020-04-12 18:41:34 +0200 |
| commit | 0a8bfc57efa5fa9b64317233ad3666a0e955f0d2 (patch) | |
| tree | 30f9d6f91aee75543ad1b6ca1574e2eaae437e6d | |
| parent | 5674c35e1477e21eaafab3a51241d84e47a679dd (diff) | |
| download | tinygo-0a8bfc57efa5fa9b64317233ad3666a0e955f0d2.tar.gz tinygo-0a8bfc57efa5fa9b64317233ad3666a0e955f0d2.zip | |
all: support Go 1.14
| -rw-r--r-- | .circleci/config.yml | 15 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | builder/config.go | 4 |
4 files changed, 16 insertions, 9 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 67ae73422..498861027 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -232,8 +232,8 @@ commands: - run: name: "Install dependencies" command: | - curl https://dl.google.com/go/go1.13.darwin-amd64.tar.gz -o go1.13.darwin-amd64.tar.gz - sudo tar -C /usr/local -xzf go1.13.darwin-amd64.tar.gz + curl https://dl.google.com/go/go1.14.darwin-amd64.tar.gz -o go1.14.darwin-amd64.tar.gz + sudo tar -C /usr/local -xzf go1.14.darwin-amd64.tar.gz ln -s /usr/local/go/bin/go /usr/local/bin/go HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu - restore_cache: @@ -327,14 +327,20 @@ jobs: steps: - test-linux: llvm: "10" + test-llvm10-go114: + docker: + - image: circleci/golang:1.14-buster + steps: + - test-linux: + llvm: "10" assert-test-linux: docker: - - image: circleci/golang:1.13-stretch + - image: circleci/golang:1.14-stretch steps: - assert-test-linux build-linux: docker: - - image: circleci/golang:1.13-stretch + - image: circleci/golang:1.14-stretch steps: - build-linux build-macos: @@ -352,6 +358,7 @@ workflows: - test-llvm9-go111 - test-llvm10-go112 - test-llvm10-go113 + - test-llvm10-go114 - build-linux - build-macos - assert-test-linux diff --git a/Dockerfile b/Dockerfile index 4632c4fb2..6d958125e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# TinyGo base stage installs Go 1.13, LLVM 10 and the TinyGo compiler itself. -FROM golang:1.13 AS tinygo-base +# TinyGo base stage installs Go 1.14, LLVM 10 and the TinyGo compiler itself. +FROM golang:1.14 AS tinygo-base RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \ echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >> /etc/apt/sources.list && \ diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 135dcf414..40a222a16 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -12,7 +12,7 @@ jobs: steps: - task: GoTool@0 inputs: - version: '1.13.8' + version: '1.14.1' - checkout: self - task: CacheBeta@0 displayName: Cache LLVM source diff --git a/builder/config.go b/builder/config.go index 8bb3a1162..aabf82ac5 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 != 12 && minor != 13) { - return nil, fmt.Errorf("requires go version 1.11, 1.12, or 1.13, got go%d.%d", major, minor) + 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) } clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT")) return &compileopts.Config{ |