Skip to content

Commit d9aefe5

Browse files
vvolandvvoland
committed
Merge tag 'v29.6.1' into 29.x
v29.6.1
2 parents 9182b35 + 8900f1d commit d9aefe5

16 files changed

Lines changed: 196 additions & 145 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
-
3737
name: Checkout
38-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
38+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3939
with:
4040
persist-credentials: false
4141
-
@@ -146,7 +146,7 @@ jobs:
146146
steps:
147147
-
148148
name: Checkout
149-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
149+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
150150
with:
151151
persist-credentials: false
152152
-

‎.github/workflows/codeql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
steps:
4747
-
4848
name: Checkout
49-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
49+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5050
with:
5151
fetch-depth: 2
5252
persist-credentials: false

‎.github/workflows/e2e.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
steps:
4545
-
4646
name: Checkout
47-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
47+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4848
with:
4949
persist-credentials: false
5050
-

‎.github/workflows/pr-review-trigger.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ permissions: {}
99

1010
jobs:
1111
save-context:
12-
if: >
13-
github.event.comment.user.login != 'docker-agent' &&
14-
github.event.comment.user.login != 'docker-agent[bot]' &&
15-
github.event.comment.user.type != 'Bot' &&
16-
!contains(github.event.comment.body, '<!-- cagent-review -->') &&
17-
!contains(github.event.comment.body, '<!-- cagent-review-reply -->')
1812
runs-on: ubuntu-latest
1913
steps:
2014
- name: Save event context

‎.github/workflows/pr-review.yml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,7 @@ permissions:
1111

1212
jobs:
1313
review:
14-
if: |
15-
(github.event_name == 'issue_comment' &&
16-
github.event.comment.user.login != 'docker-agent' &&
17-
github.event.comment.user.login != 'docker-agent[bot]' &&
18-
github.event.comment.user.type != 'Bot' &&
19-
!contains(github.event.comment.body, '<!-- cagent-review -->') &&
20-
!contains(github.event.comment.body, '<!-- cagent-review-reply -->')) ||
21-
github.event.workflow_run.conclusion == 'success'
22-
uses: docker/cagent-action/.github/workflows/review-pr.yml@3f5dc9969f307d3c76acb7e9ccaefdd96bd62f4b # v1.5.4
14+
uses: docker/docker-agent-action/.github/workflows/review-pr.yml@e96a4bb40cac114f64358621e1d08346c8eadc8c # v2.0.1
2315
permissions:
2416
contents: read # Read repository files and PR diffs
2517
pull-requests: write # Post review comments

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
-
6262
name: Checkout
63-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
63+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
6464
with:
6565
path: ${{ env.GOPATH }}/src/github.com/docker/cli
6666
persist-credentials: false

‎.github/workflows/validate.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
steps:
4949
-
5050
name: Checkout
51-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
51+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5252
with:
5353
persist-credentials: false
5454
-
@@ -76,7 +76,7 @@ jobs:
7676
steps:
7777
-
7878
name: Checkout
79-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
79+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8080
with:
8181
persist-credentials: false
8282
-
@@ -93,7 +93,7 @@ jobs:
9393
steps:
9494
-
9595
name: Checkout
96-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
96+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9797
with:
9898
path: src/github.com/docker/cli
9999
persist-credentials: false

‎.github/workflows/zizmor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
jobs:
2323
run:
24-
uses: crazy-max/.github/.github/workflows/zizmor.yml@716fd1c51a46c5d93a41d44a94b439c9ee802536 # v1.10.0
24+
uses: crazy-max/.github/.github/workflows/zizmor.yml@46267a6e61cd56aac2fc79943df180152f4c89d6 # v1.10.1
2525
permissions:
2626
contents: read
2727
security-events: write

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
29.6.0
1+
29.6.1

‎vendor.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ require (
8989
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9090
github.com/klauspost/compress v1.18.6 // indirect
9191
github.com/moby/docker-image-spec v1.3.1 // indirect
92-
github.com/moby/sys/user v0.4.0 // indirect
92+
github.com/moby/sys/user v0.4.1 // indirect
9393
github.com/moby/sys/userns v0.1.0 // indirect
9494
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9595
github.com/prometheus/client_golang v1.22.0 // indirect

0 commit comments

Comments
 (0)