sync with main

.github/workflows/codeql.yml

@@ -13,10 +13,11 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "main" ]
+    branches:
+      - '**'
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "main" ]
+    branches:
+       - '**'
   schedule:
     - cron: '45 10 * * 5'
 

.github/workflows/docker-hub-image-main.yml

@@ -2,15 +2,9 @@ name: Build and push docker images for main branch
 
 # Controls when the workflow will run
 on:
-  workflow_run:
-    workflows: ["CodeQL"]
-    branches: [main,'release-*']
-    types:
-      - completed
   push:
     branches:
       - 'main'
-      - 'release-*'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

.github/workflows/docker-hub-image-tag.yml

@@ -2,8 +2,6 @@ name: Build and push docker images for git tag
 
 # Controls when the workflow will run
 on:
-  workflow_run:
-    workflows: ["CodeQL"]
   push:
     tags:
       - 'v*.*.*'
@@ -46,9 +44,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-      - name: Set output
+      - name: Set Docker tag
         id: vars
-        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
+        run: echo "tag=${GITHUB_REF#refs/*/}  | sed 's/v//g'" >> $GITHUB_OUTPUT
+
+      - name: New docker image tag
+        run: echo "New docker image tag ${{ steps.vars.outputs.tag }}"
+
       - name: Build and push
         uses: docker/build-push-action@v5
         continue-on-error: true
@@ -59,4 +61,4 @@ jobs:
           tags: ${{ matrix.image }}:${{ steps.vars.outputs.tag }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-              AGENT_VERSION={{ steps.vars.outputs.tag }}
+              AGENT_VERSION=${{ steps.vars.outputs.tag }}

.github/workflows/snyk-security.yml

@@ -2,10 +2,11 @@ name: Snyk Security
 
 on:
   push:
-    branches: ["main" ]
+    branches:
+      - '**'
   pull_request:
-    branches: ["main"]
-
+    branches:
+      - '**'
 permissions:
   contents: read
 

.github/workflows/tests-wazuh-docker.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - 'main'
+      - 'release-*'
     tags:
       - 'v*.*.*'