Skip to content

Commit b8d8a07

Browse files
authored
Merge branch 'main' into kakkoyun/goroutine_leak
2 parents 23c21aa + 832cec7 commit b8d8a07

38 files changed

Lines changed: 429 additions & 474 deletions

.github/workflows/automerge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
steps:
1717
- name: Dependabot metadata
1818
id: metadata
19-
uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
19+
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
2020
with:
2121
github-token: "${{ secrets.GITHUB_TOKEN }}"
2222
- name: Enable auto-merge for Dependabot PRs

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ jobs:
4646

4747
steps:
4848
- name: Checkout repository
49-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
50+
with:
51+
persist-credentials: false
5052

5153
# Initializes the CodeQL tools for scanning.
5254
- name: Initialize CodeQL
53-
uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3.29.5
55+
uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5
5456
with:
5557
languages: ${{ matrix.language }}
5658
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +63,7 @@ jobs:
6163
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6264
# If this step fails, then you should remove it and run the build manually (see below)
6365
- name: Autobuild
64-
uses: github/codeql-action/autobuild@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3.29.5
66+
uses: github/codeql-action/autobuild@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5
6567

6668
# ℹ️ Command-line programs to run using the OS shell.
6769
# 📚 https://git.io/JvXDl
@@ -75,4 +77,4 @@ jobs:
7577
# make release
7678

7779
- name: Perform CodeQL Analysis
78-
uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3.29.5
80+
uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5

.github/workflows/container_description.yml

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/golangci-lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3030
with:
3131
persist-credentials: false
3232
- name: Install Go
33-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
33+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
3434
with:
3535
go-version: 1.26.x
3636
- name: Install snmp_exporter/generator dependencies
@@ -40,7 +40,7 @@ jobs:
4040
id: golangci-lint-version
4141
run: echo "version=$(make print-golangci-lint-version)" >> $GITHUB_OUTPUT
4242
- name: Lint
43-
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
43+
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
4444
with:
4545
args: --verbose
4646
version: ${{ steps.golangci-lint-version.outputs.version }}

.github/workflows/govulncheck.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: govulncheck
3+
on:
4+
pull_request:
5+
paths:
6+
- VERSION
7+
- .github/workflows/govulncheck.yml
8+
push:
9+
branches:
10+
- main
11+
- master
12+
schedule:
13+
- cron: '33 2 * * *'
14+
15+
permissions:
16+
contents: read
17+
18+
jobs:
19+
govulncheck:
20+
runs-on: ubuntu-latest
21+
name: Run govulncheck
22+
steps:
23+
- name: Install snmp_exporter/generator dependencies
24+
id: snmp-deps
25+
run: sudo apt-get update && sudo apt-get -y install libsnmp-dev
26+
if: github.repository == 'prometheus/snmp_exporter'
27+
- id: govulncheck
28+
uses: golang/govulncheck-action@3fa7bd9cee2cfdf3499a8803b226e43de7b7cdb4 # master
29+
env:
30+
GOOS: ${{ contains(github.repository, 'windows_exporter') && 'windows' || '' }}

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: "Checkout code"
32-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
32+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3333
with:
3434
persist-credentials: false
3535

@@ -43,14 +43,14 @@ jobs:
4343
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4444
# format to the repository Actions tab.
4545
- name: "Upload artifact"
46-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
46+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4747
with:
4848
name: SARIF file
4949
path: results.sarif
5050
retention-days: 5
5151

5252
# Upload the results to GitHub's code scanning dashboard.
5353
- name: "Upload to code-scanning"
54-
uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3.29.5
54+
uses: github/codeql-action/upload-sarif@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v3.29.5
5555
with:
5656
sarif_file: results.sarif

.github/workflows/test.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222
matrix: ${{ steps.versions.outputs.matrix }}
2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
25+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
26+
with:
27+
persist-credentials: false
2628
- name: Get supported Go versions JSON
2729
id: versions
2830
run: |
@@ -42,7 +44,9 @@ jobs:
4244

4345
steps:
4446
- name: Checkout code
45-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
47+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
48+
with:
49+
persist-credentials: false
4650

4751
- name: Set up Go ${{ matrix.version }}
4852
uses: actions/setup-go@v6
@@ -70,7 +74,9 @@ jobs:
7074

7175
steps:
7276
- name: Checkout code
73-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
77+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
78+
with:
79+
persist-credentials: false
7480

7581
- name: Set up Go ${{ matrix.version }}
7682
uses: actions/setup-go@v6
@@ -98,7 +104,9 @@ jobs:
98104

99105
steps:
100106
- name: Checkout code
101-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
107+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
108+
with:
109+
persist-credentials: false
102110

103111
- name: Set up Go ${{ matrix.version }}
104112
uses: actions/setup-go@v6
@@ -126,7 +134,9 @@ jobs:
126134

127135
steps:
128136
- name: Checkout code
129-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
137+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
138+
with:
139+
persist-credentials: false
130140

131141
- name: Set up Go ${{ matrix.version }}
132142
uses: actions/setup-go@v6

.github/workflows/update-go-versions.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,22 @@ on:
66
schedule:
77
- cron: '0 0 1 * *'
88

9+
# peter-evans/create-pull-request pushes the update-metrics-for-new-go-version
10+
# branch and opens the chore PR via GITHUB_TOKEN.
11+
permissions:
12+
contents: write
13+
pull-requests: write
14+
915
jobs:
1016
update-go-versions:
1117
name: Update Go Versions and Generate Tests
1218
runs-on: ubuntu-latest
1319

1420
steps:
1521
- name: Checkout repository
16-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
23+
with:
24+
persist-credentials: false
1725

1826
- name: Update Go version
1927
run: make update-go-version
@@ -22,7 +30,7 @@ jobs:
2230
# no pull request will be created and the action exits silently.
2331
- name: Create a Pull Request
2432
if: github.event_name != 'pull_request'
25-
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
33+
uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
2634
with:
2735
token: ${{ secrets.GITHUB_TOKEN }}
2836
commit-message: "Update Go Collector metrics for new Go version"

.github/workflows/validate.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ jobs:
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
25+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
26+
with:
27+
persist-credentials: false
2628

2729
- name: Check for CRLF line endings
2830
run: make check-crlf

Dockerfile

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)