Merge pull request #24 from f100024/feature/bump-version-to-035

Feature/bump version to 035

.github/workflows/make-release.yml

@@ -28,7 +28,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3
 
       - name: Make crossbuild
         run: make crossbuild
@@ -56,7 +56,7 @@ jobs:
     steps:
 
       - name: Checkout code
-        uses: actions/checkout@v3.1.0
+        uses: actions/checkout@v3
 
       - name: Set VERSION as environment variable
         run: echo "VERSION=$(cat VERSION)" >> $GITHUB_ENV
@@ -68,19 +68,19 @@ jobs:
           key: syncthing_exporter-${{ github.sha }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2.1.0
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2.2.1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.1.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v3.2.0
+        uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64,linux/arm64,linux/386,linux/arm/v6,linux/arm/v7

.github/workflows/run-tests.yml

@@ -10,14 +10,12 @@ jobs:
     name: Run tests
     runs-on: ubuntu-22.04
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
     - name: Install Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.19
-
-    - name: Checkout code
-      uses: actions/[email protected]
-
+        go-version-file: 'go.mod'
     - name: Test
       run: go test -v -cover ./collector/
 

.promu.yml

@@ -1,6 +1,6 @@
 verbose: true
 go:
-    version: 1.19
+    version: 1.20
     cgo: false
 repository:
    path: github.com/f100024/syncthing_exporter

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.5 / 2023-06-08
+---
+* Switched to go1.20
+* Updated dependencies
 ## 0.3.4 / 2022-12-02
 ---
 * Fixed crash due to missing value `lastConnectionDurationS` (thanks to @benediktschlager) 

Dockerfile

@@ -1,16 +1,16 @@
-FROM golang:1.19 as builder
+FROM golang:1.20 as builder
 COPY . /builddir
 WORKDIR /builddir
 
 RUN make build
 
-FROM alpine:3.17 as local
+FROM alpine:3.18 as local
 COPY --from=builder /builddir/syncthing_exporter /usr/bin/syncthing_exporter
 
 EXPOSE 9093
 ENTRYPOINT ["syncthing_exporter"] 
 
-FROM alpine:3.17 as ghactions
+FROM alpine:3.18 as ghactions
 ARG TARGETOS TARGETARCH TARGETVARIANT
 COPY .build/${TARGETOS}-${TARGETARCH}${TARGETVARIANT}/syncthing_exporter /usr/bin/syncthing_exporter
 

Makefile

@@ -1,7 +1,7 @@
 
 GO      	  :=  go
 PROMU   	  := $(GOPATH)/bin/promu
-PROMU_VERSION := 0.13.0
+PROMU_VERSION := 0.14.0
 PKGS	 	  = $(shell $(GO) list ./... | grep -v /vendor/)
 PREFIX  	  ?= $(shell pwd)
 BIN_DIR       ?= $(shell pwd)

VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

go.mod

@@ -1,27 +1,27 @@
 module github.com/f100024/syncthing_exporter
 
-go 1.19
+go 1.20
 
 require (
+	github.com/alecthomas/kingpin/v2 v2.3.2
 	github.com/go-kit/kit v0.12.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/prometheus/common v0.37.0
-	github.com/syncthing/syncthing v1.22.2
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6
+	github.com/prometheus/client_golang v1.15.1
+	github.com/prometheus/common v0.44.0
+	github.com/syncthing/syncthing v1.23.5
 )
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/go-logfmt/logfmt v0.6.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 )

main.go

@@ -13,7 +13,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/promlog"
 	"github.com/prometheus/common/version"
-	kingpin "gopkg.in/alecthomas/kingpin.v2"
+	kingpin "github.com/alecthomas/kingpin/v2"
 )
 
 func main() {