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 go versions: 1.14.5, 1.13.13 #7837

Merged
merged 5 commits into from
Jul 15, 2020
Merged

update go versions: 1.14.5, 1.13.13 #7837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10fb142
update go versions: 1.14.5, 1.13.13
ssoroka Jul 14, 2020
e58151f
add makefile
ssoroka Jul 14, 2020
4189fa6
add dependency on go-darwin passing
ssoroka Jul 14, 2020
517654b
require darwin to pass for nightly build
ssoroka Jul 14, 2020
b52d162
indentation fix
ssoroka Jul 14, 2020
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: 9 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ defaults:
GOFLAGS: -p=8
go-1_13: &go-1_13
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.13.12'
- image: 'quay.io/influxdb/telegraf-ci:1.13.13'
go-1_14: &go-1_14
docker:
- image: 'quay.io/influxdb/telegraf-ci:1.14.4'
- image: 'quay.io/influxdb/telegraf-ci:1.14.5'
mac: &mac
macos:
xcode: 11.3.1
Expand Down Expand Up @@ -176,12 +176,14 @@ workflows:
only: /.*/
- 'package':
requires:
- 'test-go-darwin'
- 'test-go-1.13'
- 'test-go-1.13-386'
- 'test-go-1.14'
- 'test-go-1.14-386'
- 'release':
requires:
- 'test-go-darwin'
- 'test-go-1.13'
- 'test-go-1.13-386'
- 'test-go-1.14'
Expand All @@ -194,6 +196,7 @@ workflows:
nightly:
jobs:
- 'deps'
- 'macdeps'
- 'test-go-1.13':
requires:
- 'deps'
Expand All @@ -206,8 +209,12 @@ workflows:
- 'test-go-1.14-386':
requires:
- 'deps'
- 'test-go-darwin':
requires:
- 'macdeps'
- 'nightly':
requires:
- 'test-go-darwin'
- 'test-go-1.13'
- 'test-go-1.13-386'
- 'test-go-1.14'
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- Telegraf's `--test` mode now runs processors and aggregators before printing
metrics.

- Official packages now built with Go 1.14.4.
- Official packages now built with Go 1.14.5.

- When updating the Debian package you will no longer be prompted to merge the
telegraf.conf file, instead the new version will be installed to
Expand Down
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,13 @@ plugin-%:

.PHONY: ci-1.14
ci-1.14:
docker build -t quay.io/influxdb/telegraf-ci:1.14.3 - < scripts/ci-1.14.docker
docker push quay.io/influxdb/telegraf-ci:1.14.3
docker build -t quay.io/influxdb/telegraf-ci:1.14.5 - < scripts/ci-1.14.docker
docker push quay.io/influxdb/telegraf-ci:1.14.5

.PHONY: ci-1.13
ci-1.13:
docker build -t quay.io/influxdb/telegraf-ci:1.13.11 - < scripts/ci-1.13.docker
docker push quay.io/influxdb/telegraf-ci:1.13.11
docker build -t quay.io/influxdb/telegraf-ci:1.13.13 - < scripts/ci-1.13.docker
docker push quay.io/influxdb/telegraf-ci:1.13.13

.PHONY: install
install: $(buildbin)
Expand Down
2 changes: 1 addition & 1 deletion scripts/alpine.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8 as builder
FROM golang:1.13.13 as builder
WORKDIR /go/src/github.com/influxdata/telegraf

COPY . /go/src/github.com/influxdata/telegraf
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.13.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.12
FROM golang:1.13.13

RUN chmod -R 755 "$GOPATH"

Expand Down
2 changes: 1 addition & 1 deletion scripts/ci-1.14.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.14.4
FROM golang:1.14.5

RUN chmod -R 755 "$GOPATH"

Expand Down
2 changes: 1 addition & 1 deletion scripts/stretch.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13.8 as builder
FROM golang:1.13.13 as builder
WORKDIR /go/src/github.com/influxdata/telegraf

COPY . /go/src/github.com/influxdata/telegraf
Expand Down