Merge pull request #1003 from prometheus/repo_sync

Synchronize common files from prometheus/prometheus
prometheus · Mar 17, 2022 · 6c18569 · 6c18569
2 parents 868ec21 + 0291563
commit 6c18569
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 orbs:
   go: circleci/go@0.2.0
-  prometheus: prometheus/prometheus@0.15.0
+  prometheus: prometheus/prometheus@0.16.0
 jobs:
   test:
     parameters:

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -9,13 +9,6 @@ on:
       - ".github/workflows/golangci-lint.yml"
       - ".golangci.yml"
   pull_request:
-    paths:
-      - "go.sum"
-      - "go.mod"
-      - "**.go"
-      - "scripts/errcheck_excludes.txt"
-      - ".github/workflows/golangci-lint.yml"
-      - ".golangci.yml"
 
 jobs:
   golangci:
@@ -24,8 +17,11 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-
+      - name: install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17.x
       - name: Lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3.1.0
         with:
           version: v1.44.2