Skip to content

Commit c3cbfd2

Browse files
committed
Merge origin/main and regenerate conflicted workflows
2 parents 6f6e0f2 + 2ec154b commit c3cbfd2

8 files changed

Lines changed: 24 additions & 14 deletions

.devcontainer/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM mcr.microsoft.com/devcontainers/go:1-bookworm
2+
3+
# Remove the broken yarn apt source with expired GPG key
4+
RUN rm -f /etc/apt/sources.list.d/yarn.list

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Go",
3-
"image": "mcr.microsoft.com/devcontainers/go:1-bookworm",
3+
"image": "",
44
"customizations": {
55
"vscode": {
66
"extensions": [

.github/aw/actions-lock.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,16 @@
2525
"version": "v5.0.2",
2626
"sha": "8b402f58fbc84540c8b491a91e594a4576fec3d7"
2727
},
28-
"actions/checkout@v5": {
28+
"actions/checkout@v5.0.1": {
2929
"repo": "actions/checkout",
30-
"version": "v5",
30+
"version": "v5.0.1",
3131
"sha": "93cb6efe18208431cddfb8368fd83d5badbf9bfd"
3232
},
33+
"actions/checkout@v6": {
34+
"repo": "actions/checkout",
35+
"version": "v6",
36+
"sha": "8e8c483db84b4bee98b60c0593521ed34d9990e8"
37+
},
3338
"actions/checkout@v6.0.2": {
3439
"repo": "actions/checkout",
3540
"version": "v6.0.2",
@@ -174,11 +179,6 @@
174179
"repo": "super-linter/super-linter",
175180
"version": "v8.3.2",
176181
"sha": "d5b0a2ab116623730dd094f15ddc1b6b25bf7b99"
177-
},
178-
"actions/checkout@v5.0.1": {
179-
"repo": "actions/checkout",
180-
"version": "v5.0.1",
181-
"sha": "93cb6efe18208431cddfb8368fd83d5badbf9bfd"
182182
}
183183
}
184184
}

.github/workflows/go-pattern-detector.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/release.lock.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/security-alert-burndown.campaign.lock.yml

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/super-linter.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/unbloat-docs.lock.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)