Skip to content

Commit aa6652b

Browse files
committed
chore: conflicts
Signed-off-by: Oliver Bähler <[email protected]>
2 parents 1cc70ee + 0fb9f09 commit aa6652b

File tree

260 files changed

+355
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+355
-274
lines changed

.github/actions/setup-caches/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ inputs:
99
runs:
1010
using: composite
1111
steps:
12-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
12+
- uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
1313
with:
1414
path: ~/go/pkg/mod
1515
key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('**/go.sum') }}-${{ hashFiles('Makefile') }}
16-
- uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
16+
- uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
1717
if: ${{ inputs.build-cache-key }}
1818
with:
1919
path: ~/.cache/go-build

.github/workflows/check-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Validate PR title
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: amannn/action-semantic-pull-request@71b07ef490c9e8ef772f64a62d41545ae5b9ef22
18+
- uses: amannn/action-semantic-pull-request@b439535a8eb2122b748ed2b45d1693aaabe5b0aa
1919
env:
2020
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2121
with:

.github/workflows/coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ jobs:
4848
steps:
4949
- name: Checkout Source
5050
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
51-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
51+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
5252
with:
5353
go-version-file: 'go.mod'
5454
- name: Run Gosec Security Scanner
5555
uses: securego/gosec@424fc4cd9c82ea0fd6bee9cd49c2db2c3cc0c93f # v2.22.11
5656
with:
5757
args: '-no-fail -fmt sarif -out gosec.sarif ./...'
5858
- name: Upload SARIF file
59-
uses: github/codeql-action/upload-sarif@f67ec12472e1b361f5e1e2085f5e6f85a57e3cd6
59+
uses: github/codeql-action/upload-sarif@fd448f79eb8854faeaf33eeb2afa2617df2bdf7e
6060
with:
6161
sarif_file: gosec.sarif
6262
unit_tests:
@@ -65,7 +65,7 @@ jobs:
6565
steps:
6666
- name: Checkout
6767
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
68-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
68+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
6969
with:
7070
go-version-file: 'go.mod'
7171
- name: Unit Test

.github/workflows/docker-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
# See: https://github.com/aquasecurity/trivy-action/issues/389#issuecomment-2385416577
4141
TRIVY_DB_REPOSITORY: 'public.ecr.aws/aquasecurity/trivy-db:2'
4242
- name: Upload Trivy scan results to GitHub Security tab
43-
uses: github/codeql-action/upload-sarif@f67ec12472e1b361f5e1e2085f5e6f85a57e3cd6
43+
uses: github/codeql-action/upload-sarif@fd448f79eb8854faeaf33eeb2afa2617df2bdf7e
4444
with:
4545
sarif_file: 'trivy-results.sarif'

.github/workflows/e2e.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
fetch-depth: 0
3333

34-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
34+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
3535
with:
3636
go-version-file: 'go.mod'
3737

@@ -58,7 +58,7 @@ jobs:
5858
repository: ${{ github.event.client_payload.repo }}
5959
ref: ${{ github.event.client_payload.sha }}
6060

61-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
61+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
6262
with:
6363
go-version-file: 'go.mod'
6464

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
1919
with:
2020
fetch-depth: 0
21-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
21+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
2222
with:
2323
go-version-file: 'go.mod'
2424
- name: Generate manifests
@@ -46,7 +46,7 @@ jobs:
4646
runs-on: ubuntu-24.04
4747
steps:
4848
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
49-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
49+
- uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
5050
with:
5151
go-version-file: 'go.mod'
5252
- name: Run golangci-lint

.github/workflows/releaser.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Install Go
25-
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
25+
uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
2626
with:
2727
go-version-file: 'go.mod'
2828
- name: Setup caches
2929
uses: ./.github/actions/setup-caches
3030
timeout-minutes: 5
3131
continue-on-error: true
3232
- uses: creekorful/goreportcard-action@1f35ced8cdac2cba28c9a2f2288a16aacfd507f9 # v1.0
33-
- uses: anchore/sbom-action/download-syft@a930d0ac434e3182448fe678398ba5713717112a
33+
- uses: anchore/sbom-action/download-syft@0b82b0b1a22399a1c542d4d656f70cd903571b5c
3434
- name: Install Cosign
3535
uses: sigstore/cosign-installer@7e8b541eb2e61bf99390e1afd4be13a184e9ebc5 # v3.10.1
3636
- name: Run GoReleaser

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ jobs:
3737
path: results.sarif
3838
retention-days: 5
3939
- name: Upload to code-scanning
40-
uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
40+
uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
4141
with:
4242
sarif_file: results.sarif

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pull-requests: write
1616
steps:
1717
- name: Close stale pull requests
18-
uses: actions/stale@a21a0816299b11691f9592ef0d63d08e02f06d9d
18+
uses: actions/stale@d6f8a33132340b15a7006f552936e4b9b39c00ec
1919
with:
2020
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
2121
stale-pr-message: 'This pull request has been marked as stale because it has been inactive for more than 30 days. Please update this pull request or it will be automatically closed in 30 days.'

.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ linters:
3939
min-occurrences: 2
4040
goheader:
4141
template: |-
42-
Copyright 2020-2025 Project Capsule Authors
42+
Copyright 2020-2026 Project Capsule Authors
4343
SPDX-License-Identifier: Apache-2.0
4444
inamedparam:
4545
skip-single-param: true

0 commit comments

Comments
 (0)