Skip to content

Commit 0c666ea

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
build(deps): bump the github-actions group across 1 directory with 2 updates (#50896)
Bumps the github-actions group with 2 updates in the / directory: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) and [docker/login-action](https://github.com/docker/login-action). Updates `golangci/golangci-lint-action` from 9.2.0 to 9.2.1 - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@1e7e51e...82606bf) Updates `docker/login-action` from 4.1.0 to 4.2.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@4907a6d...650006c) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 4.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: golangci/golangci-lint-action dependency-version: 9.2.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b0082e6) # Conflicts: # .github/workflows/updatecli-compose.yml
1 parent ce71b8d commit 0c666ea

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
CGO_ENABLED: 1
4343
# Pin the full commit hash
4444
# https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions#using-third-party-actions
45-
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
45+
uses: golangci/golangci-lint-action@82606bf257cbaff209d206a39f5134f0cfbfd2ee # v9.2.1
4646
with:
4747
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
4848
version: v2.12.2

.github/workflows/updatecli-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v6
2121

22+
<<<<<<< HEAD
2223
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
24+
=======
25+
- uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4.2.0
26+
>>>>>>> b0082e6e7 (build(deps): bump the github-actions group across 1 directory with 2 updates (#50896))
2327
with:
2428
registry: ghcr.io
2529
username: ${{ github.actor }}

0 commit comments

Comments
 (0)