updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168)

(cherry picked from commit 9159bd2)

# Conflicts:
#	.ci/updatecli/updatecli-bump-golang.yml
#	.github/workflows/bump-agent-versions.yml
#	.github/workflows/bump-beats-version.yml
#	.github/workflows/bump-edot-images.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/bump-vm-images.yml

Author: v1v

.ci/updatecli/updatecli-bump-edot.yml

@@ -13,6 +13,7 @@ scms:
       commitusingapi: true
       branch: '{{ .scm.branch }}'
       force: false
+      submodules: false
 
 actions:
   elastic-agent:

.ci/updatecli/updatecli-bump-golang.yml

@@ -12,7 +12,13 @@ scms:
       repository: '{{ .scm.repository }}'
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       commitusingapi: true
+<<<<<<< HEAD
       branch: main
+=======
+      branch: '{{ .scm.branch }}'
+      force: false
+      submodules: false
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
 
 actions:
   elastic-agent:

.ci/updatecli/updatecli-bump-vm-images.yml

@@ -15,6 +15,7 @@ scms:
       commitusingapi: true
       branch: '{{ requiredEnv "BRANCH_NAME" }}'
       force: false
+      submodules: false
 
 actions:
   elastic-agent:

.github/workflows/bump-agent-versions.yml

@@ -7,6 +7,22 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
+<<<<<<< HEAD
+=======
+  filter:
+    runs-on: ubuntu-slim
+    timeout-minutes: 1
+    outputs:
+      matrix: ${{ steps.generator.outputs.matrix }}
+    permissions:
+      contents: read
+    steps:
+      - id: generator
+        uses: elastic/oblt-actions/elastic/active-branches@v1
+        with:
+          filter-branches: true
+
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
   update_versions:
     runs-on: ubuntu-latest
     permissions:

.github/workflows/bump-beats-version.yml

@@ -22,6 +22,11 @@ jobs:
     steps:
     - id: generator
       uses: elastic/oblt-actions/elastic/active-branches@v1
+<<<<<<< HEAD
+=======
+      with:
+        filter-branches: true
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
 
   update-beats:
     permissions:

.github/workflows/bump-edot-images.yml

@@ -20,6 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+<<<<<<< HEAD
+=======
+        # NOTE: no need for submodules here.
+        #with:
+        #  submodules: true
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:

.github/workflows/bump-golang.yml

@@ -20,6 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+<<<<<<< HEAD
+=======
+        # NOTE: no need for submodules here.
+        #with:
+        #  submodules: true
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
 
       - uses: elastic/oblt-actions/updatecli/run@v1
         with:

.github/workflows/bump-vm-images.yml

@@ -42,6 +42,11 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+<<<<<<< HEAD
+=======
+        # NOTE: no need for submodules here.
+        #  submodules: true
+>>>>>>> 9159bd2c2 (updatecli: no submodules and remove 7.17 filter if using filter-branches (#12168))
           # NOTE: as long as the updatecli bump differs between branches, we need to
           # checkout the branch that we are going to bump that we are going to bump
           # this is needed to ensure that the updatecli bump is done against the correct updatecli