Skip to content

Commit

Permalink
Merge branch 'prometheus-community:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthieuCoder authored Oct 29, 2024
2 parents 3cb9e40 + a563de4 commit 77e1065
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 22 deletions.
41 changes: 30 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,52 @@
version: 2.1

orbs:
goreleaser: hubci/[email protected]

executors:
golang:
docker:
- image: cimg/go:1.20
go: circleci/[email protected]
goreleaser: hubci/[email protected]

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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/prometheus-community/pro-bing

go 1.19
go 1.22

require (
github.com/google/uuid v1.6.0
golang.org/x/net v0.27.0
golang.org/x/sync v0.7.0
golang.org/x/net v0.29.0
golang.org/x/sync v0.8.0
)

require golang.org/x/sys v0.22.0 // indirect
require golang.org/x/sys v0.25.0 // indirect
12 changes: 6 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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/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/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
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=

0 comments on commit 77e1065

Please sign in to comment.