Skip to content

Commit 85d2b59

Browse files
authored
Merge branch 'main' into patch-1
2 parents e0a0eb2 + c197e6b commit 85d2b59

Some content is hidden

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

49 files changed

+2879
-1145
lines changed

.github/workflows/cli.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,17 @@ jobs:
2929
VAULT_ADDR: "http://127.0.0.1:8200"
3030
steps:
3131
- name: Set up Go ${{ matrix.go-version }}
32-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
32+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3333
with:
3434
go-version: ${{ matrix.go-version }}
3535
id: go
3636

3737
- name: Check out code into the Go module directory
3838
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
39+
with:
40+
persist-credentials: false
3941

40-
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
42+
- uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
4143
with:
4244
path: ~/go/pkg/mod
4345
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -69,14 +71,14 @@ jobs:
6971

7072
- name: Upload artifact for ${{ matrix.os }}
7173
if: matrix.os != 'windows'
72-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
74+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
7375
with:
7476
name: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
7577
path: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ matrix.arch }}-${{ github.sha }}
7678

7779
- name: Upload artifact for ${{ matrix.os }}
7880
if: matrix.os == 'windows'
79-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
81+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8082
with:
8183
name: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ github.sha }}
8284
path: sops-${{ matrix.go-version }}-${{ matrix.os }}-${{ github.sha }}
@@ -94,6 +96,8 @@ jobs:
9496
steps:
9597
- name: Check out code
9698
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
99+
with:
100+
persist-credentials: false
97101

98102
# Rustup will detect toolchain version and profile from rust-toolchain.toml
99103
# It will download and install the toolchain and components automatically
@@ -104,7 +108,7 @@ jobs:
104108
- name: Show Rust version
105109
run: cargo --version
106110

107-
- uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
111+
- uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
108112
with:
109113
name: sops-${{ matrix.go-version }}-linux-amd64-${{ github.sha }}
110114

.github/workflows/codeql.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ jobs:
3030
steps:
3131
- name: Checkout code
3232
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
with:
34+
persist-credentials: false
3335

3436
# Initializes the CodeQL tools for scanning.
3537
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
38+
uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
3739
with:
3840
languages: go
3941
# xref: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
@@ -50,6 +52,6 @@ jobs:
5052
make install
5153
5254
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
55+
uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
5456
with:
5557
category: "/language:go"

.github/workflows/docs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
steps:
2525
- name: Checkout code
2626
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
27+
with:
28+
persist-credentials: false
2729

2830
- name: Install rstcheck and markdownlint
2931
run: |

.github/workflows/linters.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
steps:
2323
- name: Check out code
2424
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
with:
26+
persist-credentials: false
2527

2628
# Rustup will detect toolchain version and profile from rust-toolchain.toml
2729
# It will download and install the toolchain and components automatically

.github/workflows/release.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,42 +28,43 @@ jobs:
2828
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2929
with:
3030
fetch-depth: 0
31+
persist-credentials: false
3132

3233
- name: Setup Go
33-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v4.0.1
34+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v4.0.1
3435
with:
3536
go-version-file: go.mod
3637
cache: false
3738

3839
- name: Setup Syft
39-
uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
40+
uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
4041

4142
- name: Setup Cosign
42-
uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
43+
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
4344

4445
- name: Setup QEMU
45-
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
46+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
4647

4748
- name: Setup Docker Buildx
48-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
49+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
4950

5051
- name: Login to GitHub Container Registry
51-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
52+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5253
with:
5354
registry: ghcr.io
5455
username: ${{ github.actor }}
5556
password: ${{ secrets.GITHUB_TOKEN }}
5657

5758
- name: Login to Quay.io
58-
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
59+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
5960
with:
6061
registry: quay.io
6162
username: ${{ secrets.QUAY_BOT_USERNAME }}
6263
password: ${{ secrets.QUAY_BOT_TOKEN }}
6364

6465
- name: Run GoReleaser
6566
id: goreleaser
66-
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
67+
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
6768
with:
6869
# Note that the following is the version of goreleaser, and NOT a Go version!
6970
# When bumping it, make sure to check out goreleaser's changelog first!
@@ -168,7 +169,7 @@ jobs:
168169
id-token: write # For creating OIDC tokens for signing.
169170
contents: write # For adding assets to a release.
170171

171-
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.0.0
172+
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0
172173
with:
173174
base64-subjects: "${{ needs.combine-subjects.outputs.all-subjects }}"
174175
upload-assets: true
@@ -185,7 +186,7 @@ jobs:
185186
strategy:
186187
matrix: ${{ fromJSON(needs.release.outputs.container-subjects) }}
187188

188-
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.0.0
189+
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0
189190
with:
190191
image: ghcr.io/${{ matrix.image }}
191192
digest: ${{ matrix.digest }}
@@ -204,7 +205,7 @@ jobs:
204205
strategy:
205206
matrix: ${{ fromJSON(needs.release.outputs.container-subjects) }}
206207

207-
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.0.0
208+
uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0
208209
with:
209210
image: quay.io/${{ matrix.image }}
210211
digest: ${{ matrix.digest }}

.goreleaser.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ builds:
6969
- windows
7070
goarch:
7171
- amd64
72+
- arm64
7273
# Modified timestamp on the binary, set to ensure reproducible builds.
7374
mod_timestamp: "{{ .CommitTimestamp }}"
7475

.release/alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.18
1+
FROM alpine:3.21
22

33
RUN apk --no-cache add \
44
ca-certificates \

0 commit comments

Comments
 (0)