From 7a3441c16e987a5af2e02307903f0c5309c707dd Mon Sep 17 00:00:00 2001 From: prombot Date: Tue, 6 Aug 2024 17:49:41 +0000 Subject: [PATCH 1/4] Update common Prometheus files Signed-off-by: prombot --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 83ae390..937f2e2 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -33,7 +33,7 @@ jobs: run: sudo apt-get update && sudo apt-get -y install libsnmp-dev if: github.repository == 'prometheus/snmp_exporter' - name: Lint - uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # v6.0.1 + uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0 with: args: --verbose version: v1.59.1 From a3dcaae7ca4a9718aa34258bfbef0a83f9f6e741 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 17:22:40 +0000 Subject: [PATCH 2/4] Bump golang.org/x/net from 0.27.0 to 0.29.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.27.0 to 0.29.0. - [Commits](https://github.com/golang/net/compare/v0.27.0...v0.29.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 7650fc3..b4b8e0e 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ go 1.19 require ( github.com/google/uuid v1.6.0 - golang.org/x/net v0.27.0 + golang.org/x/net v0.29.0 golang.org/x/sync v0.7.0 ) -require golang.org/x/sys v0.22.0 // indirect +require golang.org/x/sys v0.25.0 // indirect diff --git a/go.sum b/go.sum index 11d1d19..bd2e6cd 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= From 702069fd4fbfe80c6f8a15e1505de30f1cccd592 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:31:37 +0000 Subject: [PATCH 3/4] Bump golang.org/x/sync from 0.7.0 to 0.8.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.7.0 to 0.8.0. - [Commits](https://github.com/golang/sync/compare/v0.7.0...v0.8.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b4b8e0e..3aa7df8 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( github.com/google/uuid v1.6.0 golang.org/x/net v0.29.0 - golang.org/x/sync v0.7.0 + golang.org/x/sync v0.8.0 ) require golang.org/x/sys v0.25.0 // indirect diff --git a/go.sum b/go.sum index bd2e6cd..67cbf88 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,7 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= From d86162c4f7a2b92bc2cf99908971bc98a7e7e4b5 Mon Sep 17 00:00:00 2001 From: SuperQ Date: Tue, 29 Oct 2024 15:19:06 +0100 Subject: [PATCH 4/4] Update build testing * Update minimum Go version to 1.22. * Add build test matrix. Signed-off-by: SuperQ --- .circleci/config.yml | 41 ++++++++++++++++++++++++++++++----------- go.mod | 2 +- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c47db75..a49fc38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,33 +2,52 @@ version: 2.1 orbs: - goreleaser: hubci/goreleaser@2.3.0 - -executors: - golang: - docker: - - image: cimg/go:1.20 + go: circleci/go@1.7.1 + goreleaser: hubci/goreleaser@2.5.0 jobs: build: - executor: golang + parameters: + go_version: + type: string + use_gomod_cache: + type: boolean + default: true + docker: + - image: cimg/go:<< parameters.go_version >> steps: - checkout + - when: + condition: << parameters.use_gomod_cache >> + steps: + - go/load-cache: + key: v1-go<< parameters.go_version >> - run: go mod download - run: make + - when: + condition: << parameters.use_gomod_cache >> + steps: + - go/save-cache: + key: v1-go<< parameters.go_version >> workflows: version: 2 pro-bing: jobs: - build: + name: go-<< matrix.go_version >> + matrix: + parameters: + go_version: + - "1.22" + - "1.23" filters: tags: only: /.*/ - goreleaser/release: name: test-release - version: '1.16.2' - go-version: '1.20' + version: '2.3.2' + go-version: '1.23.2' dry-run: true requires: - build @@ -37,8 +56,8 @@ workflows: only: /.*/ - goreleaser/release: name: release - version: '1.16.2' - go-version: '1.20' + version: '2.3.2' + go-version: '1.23.2' requires: - build filters: diff --git a/go.mod b/go.mod index b4b8e0e..32412e8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/prometheus-community/pro-bing -go 1.19 +go 1.22 require ( github.com/google/uuid v1.6.0