Skip to content

Commit 0376670

Browse files
QuLogicaykevl
authored andcommitted
all: support Go 1.14
1 parent 76d6c0a commit 0376670

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

.circleci/config.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ commands:
229229
- run:
230230
name: "Install dependencies"
231231
command: |
232-
curl https://dl.google.com/go/go1.13.darwin-amd64.tar.gz -o go1.13.darwin-amd64.tar.gz
233-
sudo tar -C /usr/local -xzf go1.13.darwin-amd64.tar.gz
232+
curl https://dl.google.com/go/go1.14.darwin-amd64.tar.gz -o go1.14.darwin-amd64.tar.gz
233+
sudo tar -C /usr/local -xzf go1.14.darwin-amd64.tar.gz
234234
ln -s /usr/local/go/bin/go /usr/local/bin/go
235235
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
236236
- restore_cache:
@@ -321,14 +321,19 @@ jobs:
321321
- image: circleci/golang:1.13-buster
322322
steps:
323323
- test-linux
324+
test-llvm9-go114:
325+
docker:
326+
- image: circleci/golang:1.14-buster
327+
steps:
328+
- test-linux
324329
assert-test-linux:
325330
docker:
326-
- image: circleci/golang:1.13-stretch
331+
- image: circleci/golang:1.14-stretch
327332
steps:
328333
- assert-test-linux
329334
build-linux:
330335
docker:
331-
- image: circleci/golang:1.13-stretch
336+
- image: circleci/golang:1.14-stretch
332337
steps:
333338
- build-linux
334339
build-macos:
@@ -346,6 +351,7 @@ workflows:
346351
- test-llvm9-go111
347352
- test-llvm9-go112
348353
- test-llvm9-go113
354+
- test-llvm9-go114
349355
- build-linux
350356
- build-macos
351357
- assert-test-linux

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# TinyGo base stage installs Go 1.13, LLVM 9 and the TinyGo compiler itself.
2-
FROM golang:1.13 AS tinygo-base
1+
# TinyGo base stage installs Go 1.14, LLVM 9 and the TinyGo compiler itself.
2+
FROM golang:1.14 AS tinygo-base
33

44
RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
55
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >> /etc/apt/sources.list && \

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- task: GoTool@0
1414
inputs:
15-
version: '1.13.8'
15+
version: '1.14.1'
1616
- checkout: self
1717
- task: CacheBeta@0
1818
displayName: Cache LLVM source

builder/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
2525
if err != nil {
2626
return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
2727
}
28-
if major != 1 || (minor != 11 && minor != 12 && minor != 13) {
29-
return nil, fmt.Errorf("requires go version 1.11, 1.12, or 1.13, got go%d.%d", major, minor)
28+
if major != 1 || minor < 11 || minor > 14 {
29+
return nil, fmt.Errorf("requires go version 1.11, 1.12, 1.13, or 1.14, got go%d.%d", major, minor)
3030
}
3131
clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
3232
return &compileopts.Config{

0 commit comments

Comments
 (0)