all: support Go 1.14
Этот коммит содержится в:
родитель
5674c35e14
коммит
0a8bfc57ef
4 изменённых файлов: 16 добавлений и 9 удалений
|
@ -232,8 +232,8 @@ commands:
|
||||||
- run:
|
- run:
|
||||||
name: "Install dependencies"
|
name: "Install dependencies"
|
||||||
command: |
|
command: |
|
||||||
curl https://dl.google.com/go/go1.13.darwin-amd64.tar.gz -o 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.13.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
|
ln -s /usr/local/go/bin/go /usr/local/bin/go
|
||||||
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
|
HOMEBREW_NO_AUTO_UPDATE=1 brew install qemu
|
||||||
- restore_cache:
|
- restore_cache:
|
||||||
|
@ -327,14 +327,20 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- test-linux:
|
- test-linux:
|
||||||
llvm: "10"
|
llvm: "10"
|
||||||
|
test-llvm10-go114:
|
||||||
|
docker:
|
||||||
|
- image: circleci/golang:1.14-buster
|
||||||
|
steps:
|
||||||
|
- test-linux:
|
||||||
|
llvm: "10"
|
||||||
assert-test-linux:
|
assert-test-linux:
|
||||||
docker:
|
docker:
|
||||||
- image: circleci/golang:1.13-stretch
|
- image: circleci/golang:1.14-stretch
|
||||||
steps:
|
steps:
|
||||||
- assert-test-linux
|
- assert-test-linux
|
||||||
build-linux:
|
build-linux:
|
||||||
docker:
|
docker:
|
||||||
- image: circleci/golang:1.13-stretch
|
- image: circleci/golang:1.14-stretch
|
||||||
steps:
|
steps:
|
||||||
- build-linux
|
- build-linux
|
||||||
build-macos:
|
build-macos:
|
||||||
|
@ -352,6 +358,7 @@ workflows:
|
||||||
- test-llvm9-go111
|
- test-llvm9-go111
|
||||||
- test-llvm10-go112
|
- test-llvm10-go112
|
||||||
- test-llvm10-go113
|
- test-llvm10-go113
|
||||||
|
- test-llvm10-go114
|
||||||
- build-linux
|
- build-linux
|
||||||
- build-macos
|
- build-macos
|
||||||
- assert-test-linux
|
- assert-test-linux
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# TinyGo base stage installs Go 1.13, LLVM 10 and the TinyGo compiler itself.
|
# TinyGo base stage installs Go 1.14, LLVM 10 and the TinyGo compiler itself.
|
||||||
FROM golang:1.13 AS tinygo-base
|
FROM golang:1.14 AS tinygo-base
|
||||||
|
|
||||||
RUN wget -O- https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && \
|
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 && \
|
echo "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >> /etc/apt/sources.list && \
|
||||||
|
|
|
@ -12,7 +12,7 @@ jobs:
|
||||||
steps:
|
steps:
|
||||||
- task: GoTool@0
|
- task: GoTool@0
|
||||||
inputs:
|
inputs:
|
||||||
version: '1.13.8'
|
version: '1.14.1'
|
||||||
- checkout: self
|
- checkout: self
|
||||||
- task: CacheBeta@0
|
- task: CacheBeta@0
|
||||||
displayName: Cache LLVM source
|
displayName: Cache LLVM source
|
||||||
|
|
|
@ -25,8 +25,8 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
|
return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
|
||||||
}
|
}
|
||||||
if major != 1 || (minor != 11 && minor != 12 && minor != 13) {
|
if major != 1 || minor < 11 || minor > 14 {
|
||||||
return nil, fmt.Errorf("requires go version 1.11, 1.12, or 1.13, got go%d.%d", major, minor)
|
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"))
|
clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
|
||||||
return &compileopts.Config{
|
return &compileopts.Config{
|
||||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче