Skip to content

Commit d196812

Browse files
authored
Merge branch 'main' into dependabot/go_modules/kubernetes-f879120536
2 parents 73f25a7 + 1406f0b commit d196812

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/pr.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@v4
15-
- uses: actions/setup-go@v5.0.2
15+
- uses: actions/setup-go@v5.2.0
1616
with:
1717
go-version: ${{ env.GO_VERSION }}
1818
cache: false # avoid issue like ttributes_test.go: Cannot open: File exists
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- uses: actions/checkout@v4
28-
- uses: actions/setup-go@v5.0.2
28+
- uses: actions/setup-go@v5.2.0
2929
with:
3030
go-version: ${{ env.GO_VERSION }}
3131
- name: test
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-latest
3636
steps:
3737
- uses: actions/checkout@v4
38-
- uses: actions/setup-go@v5.0.2
38+
- uses: actions/setup-go@v5.2.0
3939
with:
4040
go-version: ${{ env.GO_VERSION }}
4141
- name: build
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ubuntu-latest
4646
steps:
4747
- uses: actions/checkout@v4
48-
- uses: actions/setup-go@v5.0.2
48+
- uses: actions/setup-go@v5.2.0
4949
with:
5050
go-version: ${{ env.GO_VERSION }}
5151
- name: image-amd64-build-only
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
steps:
5757
- uses: actions/checkout@v4
58-
- uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
58+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
5959
with:
6060
# * Module download cache
6161
# * Build cache (Linux)
@@ -65,7 +65,7 @@ jobs:
6565
key: ${{ runner.os }}-${{ github.job }}-go-${{ hashFiles('**/go.sum') }}
6666
restore-keys: |
6767
${{ runner.os }}-${{ github.job }}-go-
68-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
68+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
6969
with:
7070
go-version: ${{ env.GO_VERSION }}
7171
cache: false

.github/workflows/trivy-scan.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
persist-credentials: false
2626
ref: ${{ matrix.branch }}
27-
- uses: aquasecurity/trivy-action@5681af892cd0f4997658e2bacc62bd0a894cf564 # 0.27.0
27+
- uses: aquasecurity/trivy-action@18f2510ee396bbf400402947b394f2dd8c87dbb0 # 0.29.0
2828
with:
2929
scanners: vuln
3030
scan-type: 'fs'

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
154154
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
155155
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
156156
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
157-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
158-
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
157+
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
158+
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
159159
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75 h1:6fotK7otjonDflCTK0BCfls4SPy3NcCVb5dqqmbRknE=
160160
github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75/go.mod h1:KO6IkyS8Y3j8OdNO85qEYBsRPuteD+YciPomcXdrMnk=
161161
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

0 commit comments

Comments
 (0)