Skip to content

Commit 0a8bfc5

Browse files
QuLogicdeadprogram
authored andcommitted
all: support Go 1.14
1 parent 5674c35 commit 0a8bfc5

File tree

4 files changed

+16
-9
lines changed

4 files changed

+16
-9
lines changed

.circleci/config.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ commands:
232232
- run:
233233
name: "Install dependencies"
234234
command: |
235-
curl https://dl.google.com/go/go1.13.darwin-amd64.tar.gz -o go1.13.darwin-amd64.tar.gz
236-
sudo tar -C /usr/local -xzf go1.13.darwin-amd64.tar.gz
235+
curl https://dl.google.com/go/go1.14.darwin-amd64.tar.gz -o go1.14.darwin-amd64.tar.gz
236+
sudo tar -C /usr/local -xzf go1.14.darwin-amd64.tar.gz
237237
ln -s /usr/local/go/bin/go /usr/local/bin/go
238238
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
239239
- restore_cache:
@@ -327,14 +327,20 @@ jobs:
327327
steps:
328328
- test-linux:
329329
llvm: "10"
330+
test-llvm10-go114:
331+
docker:
332+
- image: circleci/golang:1.14-buster
333+
steps:
334+
- test-linux:
335+
llvm: "10"
330336
assert-test-linux:
331337
docker:
332-
- image: circleci/golang:1.13-stretch
338+
- image: circleci/golang:1.14-stretch
333339
steps:
334340
- assert-test-linux
335341
build-linux:
336342
docker:
337-
- image: circleci/golang:1.13-stretch
343+
- image: circleci/golang:1.14-stretch
338344
steps:
339345
- build-linux
340346
build-macos:
@@ -352,6 +358,7 @@ workflows:
352358
- test-llvm9-go111
353359
- test-llvm10-go112
354360
- test-llvm10-go113
361+
- test-llvm10-go114
355362
- build-linux
356363
- build-macos
357364
- 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 10 and the TinyGo compiler itself.
2-
FROM golang:1.13 AS tinygo-base
1+
# TinyGo base stage installs Go 1.14, LLVM 10 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-10 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)