Skip to content

Commit a42a04d

Browse files
gloursglours
committed
bump Golang version to v1.22.10 and update CI actions
Signed-off-by: Guillaume Lours <[email protected]>
1 parent 34bcd03 commit a42a04d

5 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
uses: actions/checkout@v4
5757
-
5858
name: Set up Docker Buildx
59-
uses: docker/setup-buildx-action@v2
59+
uses: docker/setup-buildx-action@v3
6060
-
6161
name: Run
6262
run: |
@@ -81,13 +81,13 @@ jobs:
8181
uses: actions/checkout@v4
8282
-
8383
name: Set up QEMU
84-
uses: docker/setup-qemu-action@v2
84+
uses: docker/setup-qemu-action@v3
8585
-
8686
name: Set up Docker Buildx
87-
uses: docker/setup-buildx-action@v2
87+
uses: docker/setup-buildx-action@v3
8888
-
8989
name: Build
90-
uses: docker/bake-action@v2
90+
uses: docker/bake-action@v5
9191
with:
9292
targets: release
9393
set: |
@@ -110,10 +110,10 @@ jobs:
110110
uses: actions/checkout@v4
111111
-
112112
name: Set up Docker Buildx
113-
uses: docker/setup-buildx-action@v2
113+
uses: docker/setup-buildx-action@v3
114114
-
115115
name: Test
116-
uses: docker/bake-action@v2
116+
uses: docker/bake-action@v5
117117
with:
118118
targets: test
119119
set: |
@@ -141,10 +141,9 @@ jobs:
141141
- plugin
142142
- standalone
143143
engine:
144-
- 24.0.9
145144
- 25.0.5
146145
- 26.1.4
147-
- 27.4.0-rc.4
146+
- 27.4.1
148147
steps:
149148
- name: Prepare
150149
run: |
@@ -165,7 +164,7 @@ jobs:
165164
run: docker --version
166165
-
167166
name: Set up Docker Buildx
168-
uses: docker/setup-buildx-action@v2
167+
uses: docker/setup-buildx-action@v3
169168
-
170169
name: Set up Go
171170
uses: actions/setup-go@v5
@@ -175,7 +174,7 @@ jobs:
175174
cache: true
176175
-
177176
name: Build
178-
uses: docker/bake-action@v2
177+
uses: docker/bake-action@v5
179178
with:
180179
targets: binary-with-coverage
181180
set: |

‎.github/workflows/merge.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ jobs:
8484
uses: actions/checkout@v4
8585
-
8686
name: Set up QEMU
87-
uses: docker/setup-qemu-action@v2
87+
uses: docker/setup-qemu-action@v3
8888
-
8989
name: Set up Docker Buildx
90-
uses: docker/setup-buildx-action@v2
90+
uses: docker/setup-buildx-action@v3
9191
-
9292
name: Docker meta
9393
id: meta
94-
uses: docker/metadata-action@v4
94+
uses: docker/metadata-action@v5
9595
with:
9696
images: |
9797
${{ env.REPO_SLUG }}
@@ -102,13 +102,13 @@ jobs:
102102
-
103103
name: Login to DockerHub
104104
if: github.event_name != 'pull_request'
105-
uses: docker/login-action@v2
105+
uses: docker/login-action@v3
106106
with:
107107
username: ${{ secrets.DOCKERPUBLICBOT_USERNAME }}
108108
password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
109109
-
110110
name: Build and push image
111-
uses: docker/bake-action@v2
111+
uses: docker/bake-action@v5
112112
id: bake
113113
with:
114114
files: |
@@ -129,14 +129,15 @@ jobs:
129129
-
130130
name: Generate Token
131131
id: generate_token
132-
uses: tibdex/github-app-token@v1
132+
uses: tibdex/github-app-token@3eb77c7243b85c65e84acfa93fdbac02fb6bd532 # v2.1.0
133133
with:
134134
app_id: ${{ vars.DOCKERDESKTOP_APP_ID }}
135135
private_key: ${{ secrets.DOCKERDESKTOP_APP_PRIVATEKEY }}
136-
repository: docker/${{ secrets.DOCKERDESKTOP_REPO }}
136+
repositories: >-
137+
[docker/${{ secrets.DOCKERDESKTOP_REPO }}]
137138
-
138139
name: Trigger Docker Desktop e2e with edge version
139-
uses: actions/github-script@v6
140+
uses: actions/github-script@v7
140141
with:
141142
github-token: ${{ steps.generate_token.outputs.token }}
142143
script: |

‎.github/workflows/scorecards.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222

2323
steps:
2424
- name: "Checkout code"
25-
uses: actions/checkout@a12a3943b4bdde767164f792f33f40b04645d846 # tag=v3.0.0
25+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.4.2
2626
with:
2727
persist-credentials: false
2828

2929
- name: "Run analysis"
30-
uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # tag=v2.0.6
30+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # tag=v2.4.0
3131
with:
3232
results_file: results.sarif
3333
results_format: sarif
@@ -41,14 +41,14 @@ jobs:
4141
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
4242
# format to the repository Actions tab.
4343
- name: "Upload artifact"
44-
uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 # tag=v3.0.0
44+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # tag=v4.5.0
4545
with:
4646
name: SARIF file
4747
path: results.sarif
4848
retention-days: 5
4949

5050
# Upload the results to GitHub's code scanning dashboard.
5151
- name: "Upload to code-scanning"
52-
uses: github/codeql-action/upload-sarif@5f532563584d71fdef14ee64d17bafb34f751ce5 # tag=v1.0.26
52+
uses: github/codeql-action/upload-sarif@3096afedf9873361b2b2f65e1445b13272c83eb8 # tag=v2.20.00
5353
with:
5454
sarif_file: results.sarif

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
ARG GO_VERSION=1.22.8
18+
ARG GO_VERSION=1.22.10
1919
ARG XX_VERSION=1.6.1
2020
ARG GOLANGCI_LINT_VERSION=v1.60.2
2121
ARG ADDLICENSE_VERSION=v1.0.0

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/docker/compose/v2
22

3-
go 1.22.7
3+
go 1.22.10
44

5-
toolchain go1.23.3
5+
toolchain go1.23.4
66

77
require (
88
github.com/AlecAivazis/survey/v2 v2.3.7

0 commit comments

Comments
 (0)