Skip to content

Commit

Permalink
Merge branch '8.x' into updatecli_8.x_updatecli-hermit-8.x
Browse files Browse the repository at this point in the history
  • Loading branch information
romulets authored Nov 13, 2024
2 parents a069af8 + 2af50b0 commit e9c2273
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
12 changes: 10 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@

version: 2
updates:
# Maintain dependencies for go.mod
# Maintain dependencies for go.mod main branch
- package-ecosystem: "gomod"
directory: "/"
commit-message:
include: scope
prefix: "main"
groups:
azure:
patterns:
Expand All @@ -26,8 +29,8 @@ updates:
patterns:
- "github.com/aquasecurity/*"
labels:
- "backport-skip"
- "dependency"
- "backport-skip"
- "go"
open-pull-requests-limit: 2
# elastic/beats is using v7 in their go.mod, leading to automatic updates not working. Manual update is needed with
Expand All @@ -37,9 +40,13 @@ updates:
schedule:
interval: "monthly"

# Maintain dependencies for go.mod 8.x branch
- package-ecosystem: "gomod"
target-branch: "8.x"
directory: "/"
commit-message:
include: scope
prefix: "8.x"
groups:
azure:
patterns:
Expand All @@ -62,6 +69,7 @@ updates:
- "github.com/aquasecurity/*"
labels:
- "dependency"
- "backport-skip"
- "go"
open-pull-requests-limit: 2
# elastic/beats is using v7 in their go.mod, leading to automatic updates not working. Manual update is needed with
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.23.2
1.23.3
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/go
2 changes: 1 addition & 1 deletion bin/gofmt
2 changes: 1 addition & 1 deletion docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.1, 8.2, etc.
:doc-branch: master
:go-version: 1.23.2
:go-version: 1.23.3
:python: 3.7
:docker: 1.12
:docker-compose: 1.11

0 comments on commit e9c2273

Please sign in to comment.