Skip to content

Commit 3a6411d

Browse files
committed
Support Go 1.14.
1 parent fa86108 commit 3a6411d

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.circleci/config.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@ commands:
1010
parameters:
1111
llvm:
1212
type: string
13+
distro:
14+
type: string
15+
default: "stretch"
1316
steps:
1417
- run:
1518
name: "Install apt dependencies"
1619
command: |
17-
echo 'deb https://apt.llvm.org/buster/ llvm-toolchain-buster<<parameters.llvm>> main' | sudo tee /etc/apt/sources.list.d/llvm.list
20+
echo 'deb https://apt.llvm.org/<<parameters.distro>>/ llvm-toolchain-<<parameters.distro>><<parameters.llvm>> main' | sudo tee /etc/apt/sources.list.d/llvm.list
1821
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
1922
sudo apt-get update
2023
sudo apt-get install \
@@ -62,11 +65,16 @@ commands:
6265
paths:
6366
- lib/wasi-libc/sysroot
6467
test-linux:
68+
parameters:
69+
distro:
70+
type: string
71+
default: "stretch"
6572
steps:
6673
- checkout
6774
- submodules
6875
- apt-dependencies:
6976
llvm: "-9"
77+
distro: <<parameters.distro>>
7078
- install-node
7179
- restore_cache:
7280
keys:
@@ -321,6 +329,12 @@ jobs:
321329
- image: circleci/golang:1.13-buster
322330
steps:
323331
- test-linux
332+
test-llvm9-go114:
333+
docker:
334+
- image: circleci/golang:1.14-rc-buster
335+
steps:
336+
- test-linux:
337+
distro: "buster"
324338
assert-test-linux:
325339
docker:
326340
- image: circleci/golang:1.13-stretch
@@ -346,6 +360,7 @@ workflows:
346360
- test-llvm9-go111
347361
- test-llvm9-go112
348362
- test-llvm9-go113
363+
- test-llvm9-go114
349364
- build-linux
350365
- build-macos
351366
- assert-test-linux

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)