From 4a474a2df4b13dfc894bdb46ae836ea3ec73faa7 Mon Sep 17 00:00:00 2001
From: Pepe Fagoaga <pepe@prowler.com>
Date: Mon, 9 Dec 2024 14:23:06 +0100
Subject: [PATCH] chore(containers): support for v4.6 branch (#6063)

Co-authored-by: MrCloudSec <hello@mistercloudsec.com>
(cherry picked from commit 4b41bd6adf45db7974064bf2850b06932825f7a8)

# Conflicts:
#	.github/dependabot.yml
---
 .github/dependabot.yml                        | 44 +++++++++++++++++++
 .../workflows/build-lint-push-containers.yml  |  4 ++
 2 files changed, 48 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 7b06e0da7a..7691618c61 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -14,6 +14,10 @@ updates:
     labels:
       - "dependencies"
       - "pip"
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4b41bd6ad (chore(containers): support for v4.6 branch (#6063))
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
@@ -23,6 +27,42 @@ updates:
     labels:
       - "dependencies"
       - "github_actions"
+<<<<<<< HEAD
+=======
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    target-branch: master
+    labels:
+      - "dependencies"
+      - "npm"
+
+  # v4.6
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    target-branch: v4.6
+    labels:
+      - "dependencies"
+      - "pip"
+      - "v4"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10
+    target-branch: v4.6
+    labels:
+      - "dependencies"
+      - "github_actions"
+      - "v4"
+>>>>>>> 4b41bd6ad (chore(containers): support for v4.6 branch (#6063))
 
   - package-ecosystem: "pip"
     directory: "/"
@@ -34,6 +74,10 @@ updates:
       - "dependencies"
       - "pip"
       - "v3"
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4b41bd6ad (chore(containers): support for v4.6 branch (#6063))
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
diff --git a/.github/workflows/build-lint-push-containers.yml b/.github/workflows/build-lint-push-containers.yml
index 6961617f68..b97e3f1585 100644
--- a/.github/workflows/build-lint-push-containers.yml
+++ b/.github/workflows/build-lint-push-containers.yml
@@ -3,7 +3,11 @@ name: build-lint-push-containers
 on:
   push:
     branches:
+      # For `v3-latest`
       - "v3"
+      # For `v4-latest`
+      - "v4.6"
+      # For `latest`
       - "master"
     paths-ignore:
       - ".github/**"