Skip to content

Commit a80846f

Browse files
authored
Merge branch 'grafana:main' into fix-ot
2 parents 1247788 + ce2bd03 commit a80846f

2 files changed

Lines changed: 20 additions & 11 deletions

File tree

.github/workflows/lint-test.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ name: Lint and Test
22

33
on: pull_request
44

5+
permissions: {}
6+
57
jobs:
68
lint-and-test:
7-
89
runs-on: ubuntu-latest
910
steps:
10-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
12+
with:
13+
persist-credentials: false
1114

1215
- name: Set-up Go
13-
uses: actions/setup-go@v3
16+
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
1417
with:
1518
go-version: ^1.22
1619
cache: true
@@ -19,7 +22,7 @@ jobs:
1922
run: make check-fmt
2023

2124
- name: Lint
22-
uses: golangci/golangci-lint-action@v6.5.0
25+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 #v6.5.0
2326
with:
2427
version: v1.64.6
2528
args: --config ./golangci.yml

.github/workflows/release.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,42 @@ on:
55
types:
66
- published
77

8+
permissions: {}
9+
810
jobs:
911
release:
1012
runs-on: ubuntu-latest
1113
steps:
12-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
15+
with:
16+
persist-credentials: false
1317

1418
- name: Set-up Go
15-
uses: actions/setup-go@v3
19+
uses: actions/setup-go@be3c94b385c4f180051c996d336f57a34c397495 # v3.6.1
1620
with:
1721
go-version: ^1.22
18-
cache: true
22+
cache: false
1923

2024
- name: Test
2125
run: make test
2226

2327
- name: Docker set up buildx
24-
uses: docker/setup-buildx-action@v2
28+
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0
29+
with:
30+
cache-binary: false
2531

2632
- name: Docker set up qemu
27-
uses: docker/setup-qemu-action@v3
33+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.0
2834

2935
- name: Docker login
30-
uses: docker/login-action@v2
36+
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2.0
3137
with:
3238
registry: ghcr.io
3339
username: ${{ github.actor }}
3440
password: ${{ secrets.GITHUB_TOKEN }}
3541

3642
- name: Docker build and push
37-
uses: docker/build-push-action@v3
43+
uses: docker/build-push-action@1104d471370f9806843c095c1db02b5a90c5f8b6 # v3.0
3844
with:
3945
context: .
4046
file: Dockerfile

0 commit comments

Comments
 (0)