Bump up Go version to 1.10
This commit is contained in:
parent
397bf83924
commit
6fec9fa653
|
@ -2,7 +2,7 @@ notifications:
|
|||
email: false
|
||||
language: go
|
||||
go:
|
||||
- 1.9.x
|
||||
- 1.10.x
|
||||
sudo: false
|
||||
dist: trusty
|
||||
install: make setup
|
||||
|
|
4
Makefile
4
Makefile
|
@ -16,7 +16,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD)
|
|||
BUILD_FLAGS := $(shell echo "-ldflags '-X main.buildStamp=`date -u '+%Y-%m-%d.%H:%M:%S'` -X main.gitCommit=$(GIT_COMMIT) -X github.com/status-im/status-go/geth/params.VersionMeta=$(GIT_COMMIT)'")
|
||||
|
||||
GO ?= latest
|
||||
XGOVERSION ?= 1.9.2
|
||||
XGOVERSION ?= 1.10.x
|
||||
XGOIMAGE = statusteam/xgo:$(XGOVERSION)
|
||||
XGOIMAGEIOSSIM = statusteam/xgo-ios-simulator:$(XGOVERSION)
|
||||
|
||||
|
@ -26,7 +26,7 @@ gotest_extraflags =
|
|||
DOCKER_IMAGE_NAME ?= statusteam/status-go
|
||||
|
||||
DOCKER_TEST_WORKDIR = /go/src/github.com/status-im/status-go/
|
||||
DOCKER_TEST_IMAGE = golang:1.9
|
||||
DOCKER_TEST_IMAGE = golang:1.10
|
||||
|
||||
UNIT_TEST_PACKAGES := $(shell go list ./... | grep -v /vendor | grep -v /t/e2e | grep -v /t/destructive | grep -v /lib)
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# Build status-go in a Go builder container
|
||||
FROM golang:1.9-alpine as builder
|
||||
FROM golang:1.10-alpine as builder
|
||||
|
||||
ARG build_tags
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM karalabe/xgo-1.9.2
|
||||
FROM karalabe/xgo-1.10.x
|
||||
|
||||
# Inject the container entry point, the build script (patched for Status bindings conditional builds of C code)
|
||||
ADD build.sh /build.sh
|
||||
|
|
|
@ -1,4 +1,13 @@
|
|||
FROM statusteam/xgo:1.9.2
|
||||
FROM statusteam/xgo:1.10.x
|
||||
|
||||
# ios installer doesn't work with the default tar binary in Docker
|
||||
# (divan: I stole this solution here: https://github.com/coreos/bugs/issues/1095#issuecomment-350574389)
|
||||
# https://github.com/moby/moby/issues/19647
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends bsdtar \
|
||||
&& apt-get clean \
|
||||
&& cp $(which tar) $(which tar)~ \
|
||||
&& ln -sf $(which bsdtar) $(which tar)
|
||||
|
||||
ADD update_ios.sh /update_ios.sh
|
||||
ENV UPDATE_IOS /update_ios.sh
|
||||
|
|
Loading…
Reference in New Issue