Skip to content

Commit fc3ac29

Browse files
committed
Update common Prometheus files
Signed-off-by: prombot <[email protected]>
1 parent aae0c78 commit fc3ac29

File tree

4 files changed

+61
-7
lines changed

4 files changed

+61
-7
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
---
2+
name: Push README to Docker Hub
3+
on:
4+
push:
5+
paths:
6+
- "README.md"
7+
- ".github/workflows/container_description.yml"
8+
branches: [ main, master ]
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
PushDockerHubReadme:
15+
runs-on: ubuntu-latest
16+
name: Push README to Docker Hub
17+
if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
18+
steps:
19+
- name: git checkout
20+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
21+
- name: Set docker hub repo name
22+
run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
23+
- name: Push README to Dockerhub
24+
uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
25+
env:
26+
DOCKER_USER: ${{ secrets.DOCKER_HUB_LOGIN }}
27+
DOCKER_PASS: ${{ secrets.DOCKER_HUB_PASSWORD }}
28+
with:
29+
destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
30+
provider: dockerhub
31+
short_description: ${{ env.DOCKER_REPO_NAME }}
32+
readme_file: 'README.md'
33+
34+
PushQuayIoReadme:
35+
runs-on: ubuntu-latest
36+
name: Push README to quay.io
37+
if: github.repository_owner == 'prometheus' || github.repository_owner == 'prometheus-community' # Don't run this workflow on forks.
38+
steps:
39+
- name: git checkout
40+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
41+
- name: Set quay.io org name
42+
run: echo "DOCKER_REPO=$(echo quay.io/${GITHUB_REPOSITORY_OWNER} | tr -d '-')" >> $GITHUB_ENV
43+
- name: Set quay.io repo name
44+
run: echo "DOCKER_REPO_NAME=$(make docker-repo-name)" >> $GITHUB_ENV
45+
- name: Push README to quay.io
46+
uses: christian-korneck/update-container-description-action@d36005551adeaba9698d8d67a296bd16fa91f8e8 # v1
47+
env:
48+
DOCKER_APIKEY: ${{ secrets.QUAY_IO_API_TOKEN }}
49+
with:
50+
destination_container_repo: ${{ env.DOCKER_REPO_NAME }}
51+
provider: quay
52+
readme_file: 'README.md'

.github/workflows/golangci-lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
27+
uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
2828
- name: install Go
2929
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3030
with:
@@ -33,6 +33,6 @@ jobs:
3333
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
3434
if: github.repository == 'prometheus/snmp_exporter'
3535
- name: Lint
36-
uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
36+
uses: golangci/golangci-lint-action@9d1e0624a798bb64f6c3cea93db47765312263dc # v5.1.0
3737
with:
38-
version: v1.55.2
38+
version: v1.56.2

.yamllint

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
---
22
extends: default
3+
ignore: |
4+
ui/react-app/node_modules
35

46
rules:
57
braces:

Makefile.common

+4-4
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ endif
4949
GOTEST := $(GO) test
5050
GOTEST_DIR :=
5151
ifneq ($(CIRCLE_JOB),)
52-
ifneq ($(shell command -v gotestsum > /dev/null),)
52+
ifneq ($(shell command -v gotestsum 2> /dev/null),)
5353
GOTEST_DIR := test-results
5454
GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
5555
endif
5656
endif
5757

58-
PROMU_VERSION ?= 0.15.0
58+
PROMU_VERSION ?= 0.17.0
5959
PROMU_URL := https://github.com/prometheus/promu/releases/download/v$(PROMU_VERSION)/promu-$(PROMU_VERSION).$(GO_BUILD_PLATFORM).tar.gz
6060

6161
SKIP_GOLANGCI_LINT :=
6262
GOLANGCI_LINT :=
6363
GOLANGCI_LINT_OPTS ?=
64-
GOLANGCI_LINT_VERSION ?= v1.55.2
64+
GOLANGCI_LINT_VERSION ?= v1.56.2
6565
# golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
6666
# windows isn't included here because of the path separator being different.
6767
ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))
@@ -182,7 +182,7 @@ endif
182182
.PHONY: common-yamllint
183183
common-yamllint:
184184
@echo ">> running yamllint on all YAML files in the repository"
185-
ifeq (, $(shell command -v yamllint > /dev/null))
185+
ifeq (, $(shell command -v yamllint 2> /dev/null))
186186
@echo "yamllint not installed so skipping"
187187
else
188188
yamllint .

0 commit comments

Comments
 (0)