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

Move to Go 1.6.2 #6534

Merged
merged 1 commit into from
May 3, 2016
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## v0.13.0 [unreleased]

### Release Notes

With this release InfluxDB is moving to Go v1.6.

### Features

- [#6213](https://github.com/influxdata/influxdb/pull/6213): Make logging output location more programmatically configurable.
Expand All @@ -24,6 +28,7 @@
- [#6494](https://github.com/influxdata/influxdb/issues/6494): Support booleans for min() and max().
- [#2074](https://github.com/influxdata/influxdb/issues/2074): Support offset argument in the GROUP BY time(...) call.
- [#6533](https://github.com/influxdata/influxdb/issues/6533): Optimize SHOW SERIES
- [#6534](https://github.com/influxdata/influxdb/pull/6534): Move to Go v1.6.2 (over Go v1.4.3)

### Bugfixes

Expand Down
14 changes: 9 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@ second to sign our CLA, which can be found

Installing Go
-------------
InfluxDB requires Go 1.4.3.
InfluxDB requires Go 1.6.2.

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.4.3
gvm use go1.4.3 --default
gvm install go1.6.2
gvm use go1.6.2 --default

Installing GDM
-------------
Expand Down Expand Up @@ -144,9 +144,13 @@ To set the version and commit flags during the build pass the following to the *

where `$VERSION` is the version, `$BRANCH` is the branch, and `$COMMIT` is the git commit hash.

If you want to build packages, see `package.sh` help:
If you want to build packages, see `build.py` usage information:

```bash
package.sh -h
python build.py --help

# Or to build a package for your current system
python build.py --package
```

To run the tests, execute the following command:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu32
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN gem install fpm

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.4.3
ENV GO_VERSION 1.6.2
ENV GO_ARCH 386
RUN wget 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
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu64
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN gem install fpm

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.4.3
ENV GO_VERSION 1.6.2
ENV GO_ARCH amd64
RUN wget 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
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu64_git
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ VOLUME $PROJECT_DIR


# Install go
ENV GO_VERSION 1.4.3
ENV GO_VERSION 1.6.2
ENV GO_ARCH amd64
RUN wget 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
9 changes: 0 additions & 9 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,8 @@ install:

# To run your custom scripts instead of automatic MSBuild
build_script:
#Currently for gdm to work on Windows, we need go 1.6, but Influx is on go1.4.3, so switch the go environment
- set GOROOT=C:\go14
- set PATH=%GOROOT%\bin;%GOPATH%\bin;%PATH%
- echo %PATH%
- echo %GOPATH%
- go get -t -v ./...

# To run your custom scripts instead of automatic tests
#test_script:
- go test -race -v ./...

# To disable deployment
deploy: off

5 changes: 3 additions & 2 deletions client/influxdb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ func TestClient_Ping(t *testing.T) {
if err != nil {
t.Fatalf("unexpected error. expected %v, actual %v", nil, err)
}
if d == 0 {
t.Fatalf("expected a duration greater than zero. actual %v", d)
if d.Nanoseconds() == 0 {
t.Fatalf("expected a duration greater than zero. actual %v", d.Nanoseconds())
}
if version != "x.x" {
t.Fatalf("unexpected version. expected %s, actual %v", "x.x", version)
Expand Down Expand Up @@ -549,6 +549,7 @@ func TestEpochToTime(t *testing.T) {

func emptyTestServer() *httptest.Server {
return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
time.Sleep(50 * time.Millisecond)
w.Header().Set("X-Influxdb-Version", "x.x")
return
}))
Expand Down
5 changes: 3 additions & 2 deletions stress/stress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,7 @@ var basicQC = &BasicQueryClient{

func TestBasicQueryClient_Query(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
time.Sleep(50 * time.Millisecond)
w.Header().Set("X-Influxdb-Version", "x.x")
var data client.Response
w.WriteHeader(http.StatusOK)
Expand All @@ -413,8 +414,8 @@ func TestBasicQueryClient_Query(t *testing.T) {
}

elapsed := r.Timer.Elapsed()
if elapsed == time.Duration(0) {
t.Errorf("Expected %v to not be 0", elapsed)
if elapsed.Nanoseconds() == 0 {
t.Errorf("Expected %v to not be 0", elapsed.Nanoseconds())
}

}
Expand Down