merge Develop

.github/workflows/codeql.yml

@@ -0,0 +1,46 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: ["main", "develop"]
+  pull_request:
+    branches: ["main", "develop"]
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ${{ 'ubuntu-latest' }}
+    timeout-minutes: ${{ 360 }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: java-kotlin
+            build-mode: none
+          - language: javascript-typescript
+            build-mode: none
+          - language: python
+            build-mode: none
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/cypress.yml

@@ -2,9 +2,9 @@ name: Run Cypress
 
 on:
   push:
-    branches: ["main"]
+    branches: [main, develop]
   pull_request:
-    branches: ["main"]
+    branches: [main, develop]
 
   workflow_dispatch:
 
@@ -32,6 +32,7 @@ jobs:
           path: test/cypress/mochawesome-report
 
   upload:
+    if: ${{ !cancelled() && github.ref == 'refs/heads/main'}}
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -49,25 +50,3 @@ jobs:
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
           aws_bucket: ${{ secrets.AWS_BUCKET }}
           source_dir: "test/cypress/mochawesome-report"
-# update-readme:
-#   needs: build
-#   runs-on: ubuntu-latest
-#   steps:
-#     - name: Checkout repo
-#       uses: actions/checkout@v3
-
-#     - name: Update README
-#       run: |
-#         echo "Adding new content to README" >> README.md
-
-#     - name: Commit and push if changed
-#       run: |
-#         git config --global user.email "[email protected]"
-#         git config --global user.name "Nil Gallego"
-#         git add README.md
-#         # Check for changes
-#         git diff --exit-code --cached || (
-#           # Only commit and push if there are changes
-#           git commit -m "Update README [skip ci]"
-#           git push
-#         )

.github/workflows/deploy_aws_vpc.yml

@@ -2,9 +2,9 @@ name: Validate AWS Terraform templates
 
 on:
   push:
-    branches: ["main"]
+    branches: [main, develop]
   pull_request:
-    branches: ["main"]
+    branches: [main, develop]
 
   workflow_dispatch:
 

.github/workflows/deploy_azure_vpc.yml

@@ -2,9 +2,9 @@ name: Validate Azure Terraform templates
 
 on:
   push:
-    branches: ["main"]
+    branches: [main, develop]
   pull_request:
-    branches: ["main"]
+    branches: [main, develop]
 
   workflow_dispatch:
 

.github/workflows/🎭_nodejs.yml

@@ -2,9 +2,9 @@ name: Run 🎭 Nodejs
 
 on:
   push:
-    branches: ["main"]
+    branches: [main, develop]
   pull_request:
-    branches: ["main"]
+    branches: [main, develop]
 
   workflow_dispatch:
 
@@ -34,6 +34,7 @@ jobs:
           path: test/playwright/nodejs/playwright-report
 
   upload:
+    if: ${{ !cancelled() && github.ref == 'refs/heads/main'}}
     needs: build
     runs-on: ubuntu-latest
     steps:
@@ -51,28 +52,4 @@ jobs:
           container_name: ${{ vars.CONTAINER_NAME }}
           connection_string: ${{ secrets.ConnectionString }}
           extra_args: "--pattern *.html"
-          # WARNING: this will overwrite existing blobs in your blob storage
           overwrite: "true"
-
-  # update-readme:
-  #   needs: build
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout repo
-  #       uses: actions/checkout@v3
-
-  #     - name: Update README
-  #       run: |
-  #         echo "Adding new content to README" >> README.md
-
-  #     - name: Commit and push if changed
-  #       run: |
-  #         git config --global user.email "[email protected]"
-  #         git config --global user.name "Nil Gallego"
-  #         git add README.md
-  #         # Check for changes
-  #         git diff --exit-code --cached || (
-  #           # Only commit and push if there are changes
-  #           git commit -m "Update README [skip ci]"
-  #           git push
-  #         )

.github/workflows/🎭_nodejs_📦.yml

@@ -1,9 +1,9 @@
 name: Run 🎭 Nodejs 📦
 on:
   push:
-    branches: [main]
+    branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 jobs:
   playwright:
     name: "Playwright Tests"

.github/workflows/🎭_☕️.yml

@@ -2,9 +2,9 @@ name: Run 🎭 ☕️
 
 on:
   push:
-    branches: ["main"]
+    branches: [main, develop]
   pull_request:
-    branches: ["main"]
+    branches: [main, develop]
 
   workflow_dispatch:
 

.github/workflows/🎭_🐍.yml

@@ -1,9 +1,9 @@
 name: Run 🎭 🐍
 on:
   push:
-    branches: [main]
+    branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 jobs:
   test:
     timeout-minutes: 60

.github/workflows/🎭_🐍_📦.yml

@@ -1,9 +1,9 @@
 name: Run 🎭 🐍 📦
 on:
   push:
-    branches: [main]
+    branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 jobs:
   playwright:
     name: "Playwright Tests"

readme.md

@@ -12,6 +12,10 @@
 | [![Run 🎭 🐍](https://github.com/nilgaar/DevOpsMaker/actions/workflows/%F0%9F%8E%AD_%F0%9F%90%8D.yml/badge.svg)](https://github.com/nilgaar/DevOpsMaker/actions/workflows/%F0%9F%8E%AD_%F0%9F%90%8D.yml)                              |
 | [![Run 🎭 🐍 📦](https://github.com/nilgaar/DevOpsMaker/actions/workflows/%F0%9F%8E%AD_%F0%9F%90%8D_%F0%9F%93%A6.yml/badge.svg)](https://github.com/nilgaar/DevOpsMaker/actions/workflows/%F0%9F%8E%AD_%F0%9F%90%8D_%F0%9F%93%A6.yml) |
 
+| Security                                                                                                                                                        |
+| --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| [![CodeQL](https://github.com/nilgaar/DevOpsMaker/actions/workflows/codeql.yml/badge.svg)](https://github.com/nilgaar/DevOpsMaker/actions/workflows/codeql.yml) |
+
 > [!WARNING]
 > This repos is WIP