Skip to content

Commit

Permalink
Merge pull request #17 from f100024/feature/update-to-1183
Browse files Browse the repository at this point in the history
Bump dependencies versions;
  • Loading branch information
f100024 authored Jun 12, 2022
2 parents 8473627 + 5c17511 commit 2130eaa
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 284 deletions.
20 changes: 7 additions & 13 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,8 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v2

- name: Install promu
run: |
mkdir -p $GOPATH
wget --quiet https://github.com/prometheus/promu/releases/download/v0.12.0/promu-0.12.0.linux-amd64.tar.gz
tar -C $GOPATH -xzf promu-0.12.0.linux-amd64.tar.gz
uses: actions/[email protected]

- name: Make crossbuild
run: make crossbuild

Expand All @@ -38,25 +32,25 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3.0.2

- name: Set up QEMU
uses: docker/setup-qemu-action@v1.2.0
uses: docker/setup-qemu-action@v2.0.0

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1.6.0
uses: docker/setup-buildx-action@v2.0.0

- name: Set VERSION as environment variable
run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV

- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2.0.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3.0.0
with:
context: .
platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v6,linux/arm/v7
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.18

- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3.0.2

- name: Test
run: go test -v -cover ./collector/
Expand Down
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
verbose: true
go:
version: 1.17
version: 1.18
cgo: false
repository:
path: github.com/f100024/syncthing_exporter
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.3.3 / 2022-06-12
---
* Switch to go1.18
* Updated dependencies
* Updated promu to 0.13.0

## 0.3.2 / 2021-10-19
---
* Switch to go1.17
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/prometheus/golang-builder:1.17-base as builder
FROM quay.io/prometheus/golang-builder:1.18-base as builder

COPY . /builddir
WORKDIR /builddir
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

GO := go
PROMU := $(GOPATH)/bin/promu
PROMU_VERSION := 0.12.0
PROMU_VERSION := 0.13.0
pkgs = $(shell $(GO) list ./... | grep -v /vendor/)
PREFIX ?= $(shell pwd)
BIN_DIR ?= $(shell pwd)
Expand Down Expand Up @@ -38,5 +38,4 @@ release: promu
promu:
@GOOS=$(shell uname -s | tr A-Z a-z) \
GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
$(GO) get -u github.com/prometheus/promu@v$(PROMU_VERSION)

$(GO) install github.com/prometheus/promu@v$(PROMU_VERSION)
13 changes: 6 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
module github.com/f100024/syncthing_exporter

go 1.17
go 1.18

require (
github.com/go-kit/kit v0.12.0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.31.1
github.com/syncthing/syncthing v1.18.3
github.com/prometheus/client_golang v1.12.2
github.com/prometheus/common v0.34.0
github.com/syncthing/syncthing v1.20.2
gopkg.in/alecthomas/kingpin.v2 v2.2.6
)

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/go-kit/log v0.2.0 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
golang.org/x/sys v0.0.0-20211015200801-69063c4bb744 // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
google.golang.org/protobuf v1.27.1 // indirect
)
276 changes: 19 additions & 257 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit 2130eaa

Please sign in to comment.