Skip to content

Commit

Permalink
Merge pull request #53 from SuperQ/bump_goping_tracking
Browse files Browse the repository at this point in the history
Update modules
  • Loading branch information
SuperQ authored May 1, 2021
2 parents 0f5c156 + f752914 commit 722200c
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
version: 2.1

orbs:
prometheus: prometheus/prometheus@0.8.0
prometheus: prometheus/prometheus@0.11.0

executors:
# This must match .promu.yml.
golang:
docker:
- image: circleci/golang:1.15
- image: circleci/golang:1.16

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
go:
# This must match .circle/config.yml.
version: 1.15
version: 1.16
repository:
path: github.com/superq/smokeping_prober
build:
Expand Down
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@
* [ENHANCEMENT]
* [BUGFIX]

# 0.4.1 / 2020-02-02
# 0.4.2 / 2021-04-10

* [BUGFIX] Fix sequence number wrapping #53

# 0.4.1 / 2021-02-02

* [ENHANCEMENT] Smooth out pingers over the interval #48
* [BUGFIX] Fix memory leak #49
Expand Down
4 changes: 2 additions & 2 deletions Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ ifneq ($(shell which gotestsum),)
endif
endif

PROMU_VERSION ?= 0.7.0
PROMU_VERSION ?= 0.11.1
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz

GOLANGCI_LINT :=
GOLANGCI_LINT_OPTS ?=
GOLANGCI_LINT_VERSION ?= v1.18.0
GOLANGCI_LINT_VERSION ?= v1.36.0
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
# windows isn't included here because of the path separator being different.
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4.1
0.4.2
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/superq/smokeping_prober

go 1.14

require (
github.com/go-ping/ping v0.0.0-20210201192233-b6486c6f1f2d
github.com/prometheus/client_golang v1.9.0
github.com/prometheus/common v0.15.0
github.com/go-ping/ping v0.0.0-20210417180633-a50937ef0888
github.com/prometheus/client_golang v1.10.0
github.com/prometheus/common v0.20.0
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

go 1.14
73 changes: 23 additions & 50 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 722200c

Please sign in to comment.