Merge pull request #157 from prombot/repo_sync

Synchronize common files from prometheus/prometheus

Author: tjhop

.github/dependabot.yml

@@ -1,3 +1,6 @@
+###
+# This file is synced from https://github.com/prometheus/prometheus
+###
 version: 2
 updates:
   - package-ecosystem: "gomod"
@@ -17,6 +20,9 @@ updates:
       k8s.io:
         patterns:
           - "k8s.io/*"
+      prometheus:
+        patterns:
+          - "github.com/prometheus/*"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -30,6 +36,7 @@ updates:
           - "github/codeql-action*"
     # Exclude configs synced from upstream prometheus/prometheus.
     exclude-paths:
+      - .github/workflows/approve-workflows.yml
       - .github/workflows/container_description.yml
       - .github/workflows/golangci-lint.yml
       - .github/workflows/govulncheck.yml

.github/workflows/approve-workflows.yml

@@ -0,0 +1,27 @@
+---
+###
+# This action is synced from https://github.com/prometheus/prometheus
+###
+name: Approve pending workflows
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions: read-all
+
+jobs:
+  approve:
+    if: >-
+      github.event.issue.pull_request &&
+      github.event.comment.body == '/workflow-approve' &&
+      (github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community')
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+      contents: read
+      pull-requests: write
+    steps:
+      - uses: prometheus/promci/approve_workflows@370e8c15dcec50043cbe66f2f34633d9efc0a190 # v0.9.0
+        with:
+          github_token: ${{ github.token }}

.github/workflows/container_description.yml

@@ -1,4 +1,7 @@
 ---
+###
+# This action is synced from https://github.com/prometheus/prometheus
+###
 name: Push README to Docker Hub
 on:
   push:

.github/workflows/govulncheck.yml

@@ -1,4 +1,7 @@
 ---
+###
+# This action is synced from https://github.com/prometheus/prometheus
+###
 name: govulncheck
 on:
   pull_request:

Makefile.common

@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v2.11.4
+GOLANGCI_LINT_VERSION ?= v2.12.2
 GOLANGCI_FMT_OPTS ?=
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.