Skip to content

Commit e284b76

Browse files
authored
Merge pull request #13 from SuperQ/superq/cut-0.3.1
Release v0.3.1
2 parents 6dfd116 + b36eb0b commit e284b76

7 files changed

Lines changed: 271 additions & 19 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ executors:
88
# This must match .promu.yml.
99
golang:
1010
docker:
11-
- image: cimg/go:1.18
11+
- image: cimg/go:1.19
1212

1313
jobs:
1414
test:

.promu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
go:
22
# Whenever the Go version is updated here,
33
# .circleci/config.yml should also be updated.
4-
version: 1.18
4+
version: 1.19
55

66
repository:
77
path: github.com/superq/chrony_exporter

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
## main / unreleased
22

3+
## 0.3.1 / 2022-09-29
4+
5+
* [CHANGE] Update build to Go 1.19. #13
6+
* [ChANGE] Update dependencies. #13
7+
38
## 0.3.0 / 2022-07-11
49

510
* [CHANGE] Fix tracking info metric #8

Makefile.common

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,19 @@ endif
5858
PROMU_VERSION ?= 0.13.0
5959
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
6060

61+
SKIP_GOLANGCI_LINT :=
6162
GOLANGCI_LINT :=
6263
GOLANGCI_LINT_OPTS ?=
63-
GOLANGCI_LINT_VERSION ?= v1.45.2
64+
GOLANGCI_LINT_VERSION ?= v1.49.0
6465
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64.
6566
# windows isn't included here because of the path separator being different.
6667
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
6768
ifeq ($(GOHOSTARCH),$(filter $(GOHOSTARCH),amd64 i386))
6869
# If we're in CI and there is an Actions file, that means the linter
6970
# is being run in Actions, so we don't need to run it here.
70-
ifeq (,$(CIRCLE_JOB))
71+
ifneq (,$(SKIP_GOLANGCI_LINT))
72+
GOLANGCI_LINT :=
73+
else ifeq (,$(CIRCLE_JOB))
7174
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint
7275
else ifeq (,$(wildcard .github/workflows/golangci-lint.yml))
7376
GOLANGCI_LINT := $(FIRST_GOPATH)/bin/golangci-lint

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.3.0
1+
0.3.1

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/superq/chrony_exporter
33
go 1.17
44

55
require (
6-
github.com/facebook/time v0.0.0-20220708172321-77a8e2e9790d
6+
github.com/facebook/time v0.0.0-20220914140257-5badd5f4fb20
77
github.com/go-kit/log v0.2.1
88
github.com/prometheus/client_golang v1.13.0
99
github.com/prometheus/common v0.37.0
@@ -25,11 +25,11 @@ require (
2525
github.com/pkg/errors v0.9.1 // indirect
2626
github.com/prometheus/client_model v0.2.0 // indirect
2727
github.com/prometheus/procfs v0.8.0 // indirect
28-
github.com/sirupsen/logrus v1.8.1 // indirect
29-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
30-
golang.org/x/net v0.0.0-20220524220425-1d687d428aca // indirect
31-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
32-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
28+
github.com/sirupsen/logrus v1.9.0 // indirect
29+
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect
30+
golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect
31+
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
32+
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
3333
golang.org/x/text v0.3.7 // indirect
3434
google.golang.org/appengine v1.6.7 // indirect
3535
google.golang.org/protobuf v1.28.1 // indirect

go.sum

Lines changed: 252 additions & 8 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)