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.

Sign up for GitHub

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

Jump to bottom

Update to go1.7 #980

Merged
merged 3 commits into from
Oct 20, 2016
Merged

Update to go1.7 #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce75d09
update to go1.7
nathanielc Oct 20, 2016
2deb973
turn off tests against go tip as the text/template has changed and is…
nathanielc Oct 20, 2016
542690e
update changelog
nathanielc Oct 20, 2016
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
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

## v1.0.3 [unreleased]

### Release Notes

### Features

### Bugfixes

- [#980](https://github.com/influxdata/kapacitor/pull/980): Upgrade to using go 1.7


## v1.0.2 [2016-10-06]

### Release Notes
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_build_ubuntu32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ RUN wget https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.6.3
ENV GO_VERSION 1.7.3
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN wget https://github.com/google/protobuf/releases/download/v${PROTO_VERSION}/

# Install go
ENV GOPATH /root/go
ENV GO_VERSION 1.6.3
ENV GO_VERSION 1.7.3
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
8 changes: 4 additions & 4 deletions server/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ func TestServer_EnableTask(t *testing.T) {
dot := `digraph testTaskID {
graph [throughput="0.00 points/s"];

stream0 [avg_exec_time_ns="0" ];
stream0 [avg_exec_time_ns="0s" ];
stream0 -> from1 [processed="0"];

from1 [avg_exec_time_ns="0" ];
from1 [avg_exec_time_ns="0s" ];
}`
if ti.Dot != dot {
t.Fatalf("unexpected dot\ngot\n%s\nexp\n%s\n", ti.Dot, dot)
Expand Down Expand Up @@ -403,10 +403,10 @@ func TestServer_EnableTaskOnCreate(t *testing.T) {
dot := `digraph testTaskID {
graph [throughput="0.00 points/s"];

stream0 [avg_exec_time_ns="0" ];
stream0 [avg_exec_time_ns="0s" ];
stream0 -> from1 [processed="0"];

from1 [avg_exec_time_ns="0" ];
from1 [avg_exec_time_ns="0s" ];
}`
if ti.Dot != dot {
t.Fatalf("unexpected dot\ngot\n%s\nexp\n%s\n", ti.Dot, dot)
Expand Down
16 changes: 8 additions & 8 deletions test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# 0: normal 64bit tests
# 1: race enabled 64bit tests
# 2: normal 32bit tests
# 3: normal 64bit tests against Go 1.6beta2
# 3: normal 64bit tests against Go HEAD
# save: build the docker images and save them to DOCKER_SAVE_DIR. Do not run tests.
# count: print the number of test environments
# *: to run all tests in parallel containers
Expand Down Expand Up @@ -42,7 +42,7 @@ fi
DOCKER_RM=${DOCKER_RM-true}

# Update this value if you add a new test environment.
ENV_COUNT=4
ENV_COUNT=3

# Default return code 0
rc=0
Expand Down Expand Up @@ -154,12 +154,12 @@ case $ENVIRONMENT_INDEX in
run_test_docker Dockerfile_build_ubuntu32 test_32bit --debug --test --generate $no_uncommitted_arg --arch=i386
rc=$?
;;
3)
# 64 bit tests on golang go1.6
GO_CHECKOUT=go1.6rc2
run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go1.6 --debug --test --generate $no_uncommitted_arg
rc=$?
;;
#3)
# # 64 bit tests on golang HEAD
# GO_CHECKOUT=HEAD
# run_test_docker Dockerfile_build_ubuntu64_git test_64bit_go_tip --debug --test --generate $no_uncommitted_arg
# rc=$?
# ;;
"save")
# Save docker images for every Dockerfile_build* file.
# Useful for creating an external cache.
Expand Down