From f3e3333ebae992137d6e615bed10bfb1c870f0e9 Mon Sep 17 00:00:00 2001 From: prombot Date: Fri, 6 May 2022 11:02:56 +0000 Subject: [PATCH] Update common Prometheus files Signed-off-by: prombot --- .circleci/config.yml | 2 +- .github/workflows/golangci-lint.yml | 12 +++++++++--- CODE_OF_CONDUCT.md | 4 ++-- Makefile.common | 2 +- SECURITY.md | 2 +- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6738877..f64d4b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - prometheus: prometheus/prometheus@0.15.0 + prometheus: prometheus/prometheus@0.16.0 executors: # Whenever the Go version is updated here, .promu.yml should also be updated. golang: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index ad298b9..136d7d4 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -17,8 +17,14 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 - + - name: install Go + uses: actions/setup-go@v2 + with: + go-version: 1.18.x + - name: Install snmp_exporter/generator dependencies + 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@v2 + uses: golangci/golangci-lint-action@v3.1.0 with: - version: v1.44.2 + version: v1.45.2 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9a1aff4..d325872 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,3 @@ -## Prometheus Community Code of Conduct +# Prometheus Community Code of Conduct -Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). +Prometheus follows the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md). diff --git a/Makefile.common b/Makefile.common index 5ab1b14..c263b73 100644 --- a/Makefile.common +++ b/Makefile.common @@ -83,7 +83,7 @@ PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_ GOLANGCI_LINT := GOLANGCI_LINT_OPTS ?= -GOLANGCI_LINT_VERSION ?= v1.44.2 +GOLANGCI_LINT_VERSION ?= v1.45.2 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64. # windows isn't included here because of the path separator being different. ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin)) diff --git a/SECURITY.md b/SECURITY.md index 67741f0..fed02d8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,4 +3,4 @@ The Prometheus security policy, including how to report vulnerabilities, can be found here: -https://prometheus.io/docs/operating/security/ + -- 2.25.1