Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
20 changes: 4 additions & 16 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,16 @@ 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).

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
-------------
Expand Down Expand Up @@ -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 ./...
Expand Down
41 changes: 0 additions & 41 deletions Dockerfile_build_ubuntu64_go1.12

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile_jenkins_ubuntu32
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
8 changes: 1 addition & 7 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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
Expand Down Expand Up @@ -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
;;
Expand Down