chore(build): remove all of the go1.12 references from build (#18849)

pull/18826/head
Gershon Shif 2020-07-02 12:19:35 -07:00 committed by GitHub
parent 637ca24d5e
commit 28268fd4b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 66 deletions

View File

@ -7,7 +7,7 @@ jobs:
docker_layer_caching: true
environment:
- PARALLELISM: 4 # Input to influxdb/build.py
parallelism: 5 # How many CircleCI test containers
parallelism: 4 # How many CircleCI test containers
steps:
- checkout
- run:

View File

@ -69,7 +69,7 @@ second to sign our CLA, which can be found
Installing Go
-------------
InfluxDB requires Go 1.12.
InfluxDB requires Go 1.13
At InfluxDB we find gvm, a Go version manager, useful for installing Go. For instructions
on how to install it see [the gvm page on github](https://github.com/moovweb/gvm).
@ -77,14 +77,8 @@ on how to install it see [the gvm page on github](https://github.com/moovweb/gvm
After installing gvm you can install and set the default go version by
running the following:
gvm install go1.12
gvm use go1.12 --default
Installing Dep
-------------
InfluxDB uses [dep](https://github.com/golang/dep) to manage dependencies. Install it by running the following:
go get github.com/golang/dep/cmd/dep
gvm install go1.13
gvm use go1.13 --default
Revision Control Systems
-------------
@ -122,13 +116,7 @@ Retaining the directory structure `$GOPATH/src/github.com/influxdata` is necessa
Build and Test
-----
Make sure you have Go installed and the project structure as shown above. To then get the dependencies for the project, execute the following commands:
```bash
cd $GOPATH/src/github.com/influxdata/influxdb
dep ensure
```
Make sure you have Go installed and the project structure as shown above.
To then build and install the binaries, run the following command.
```bash
go clean ./...

View File

@ -1,41 +0,0 @@
FROM ubuntu:xenial
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
python-software-properties \
software-properties-common \
wget \
git \
mercurial \
make \
ruby \
ruby-dev \
autoconf \
libtool \
build-essential \
rpm \
zip \
python \
python-boto \
asciidoc \
xmlto \
docbook-xsl
RUN gem install fpm
# setup environment
ENV GO_VERSION 1.12
ENV GOARCH amd64
ENV GOROOT /usr/local/go
ENV GOPATH /root/go
ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH
ENV PROJECT_DIR /root/influxdb
# install go
RUN wget --no-verbose https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GOARCH}.tar.gz -O- | tar -C /usr/local/ -zxf-
RUN mkdir -p $PROJECT_DIR
WORKDIR $PROJECT_DIR
VOLUME $PROJECT_DIR
ENTRYPOINT [ "/root/influxdb/build.py" ]

View File

@ -11,7 +11,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
# Install go
ENV GOCACHE=/tmp
ENV GOPATH /go
ENV GO_VERSION 1.12
ENV GO_VERSION 1.13
ENV GO_ARCH 386
RUN wget --no-verbose -q https://storage.googleapis.com/golang/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
tar -C /usr/local/ -xf /go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \

View File

@ -9,7 +9,6 @@
# 1: race enabled 64bit tests
# 2: normal 32bit tests
# 3: tsi build
# 4: go 1.12
# count: print the number of test environments
# *: to run all tests in parallel containers
#
@ -32,7 +31,7 @@ TIMEOUT=${TIMEOUT-1500s}
DOCKER_RM=${DOCKER_RM-true}
# Update this value if you add a new test environment.
ENV_COUNT=5
ENV_COUNT=4
# Default return code 0
rc=0
@ -123,11 +122,6 @@ case $ENVIRONMENT_INDEX in
run_test_docker Dockerfile_build_ubuntu64 test_64bit --test --junit-report
rc=$?
;;
4)
# go1.12
run_test_docker Dockerfile_build_ubuntu64_go1.12 test_64bit --test --junit-report
rc=$?
;;
"count")
echo $ENV_COUNT
;;