Skip to content

Commit

Permalink
Update common Prometheus files (#1332)
Browse files Browse the repository at this point in the history
Signed-off-by: prombot <prometheus-team@googlegroups.com>
  • Loading branch information
prombot committed Aug 15, 2023
1 parent c17edf0 commit 51d24f8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/golangci-lint.yml
@@ -1,3 +1,5 @@
---
# This action is synced from https://github.com/prometheus/prometheus
name: golangci-lint
on:
push:
Expand All @@ -10,15 +12,8 @@ on:
- ".golangci.yml"
pull_request:

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
golangci:
permissions:
contents: read # to fetch code (actions/checkout)
pull-requests: read # to fetch pull requests (golangci/golangci-lint-action)

name: lint
runs-on: ubuntu-latest
steps:
Expand All @@ -34,5 +29,4 @@ jobs:
- name: Lint
uses: golangci/golangci-lint-action@v3.4.0
with:
args: --verbose
version: v1.53.3
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -55,7 +55,7 @@ ifneq ($(shell command -v gotestsum > /dev/null),)
endif
endif

PROMU_VERSION ?= 0.14.0
PROMU_VERSION ?= 0.15.0
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz

SKIP_GOLANGCI_LINT :=
Expand Down

0 comments on commit 51d24f8

Please sign in to comment.