HanilJain
diff --git a/‎.github/ISSUE_TEMPLATE/bug-report.md
Lines changed: 0 additions & 28 deletions b/‎.github/ISSUE_TEMPLATE/bug-report.md
Lines changed: 0 additions & 28 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/feature-request.md
Lines changed: 0 additions & 17 deletions b/‎.github/ISSUE_TEMPLATE/feature-request.md
Lines changed: 0 additions & 17 deletions
diff --git a/‎.github/ISSUE_TEMPLATE/test.yml
Lines changed: 0 additions & 64 deletions b/‎.github/ISSUE_TEMPLATE/test.yml
Lines changed: 0 additions & 64 deletions
diff --git a/‎.github/workflows/assign-issues.yml
Lines changed: 5 additions & 3 deletions b/‎.github/workflows/assign-issues.yml
Lines changed: 5 additions & 3 deletions
diff --git a/‎.github/workflows/auto-approve-dependabot.yml
Lines changed: 6 additions & 3 deletions b/‎.github/workflows/auto-approve-dependabot.yml
Lines changed: 6 additions & 3 deletions
diff --git a/‎.github/workflows/auto-merge.yml
Lines changed: 3 additions & 0 deletions b/‎.github/workflows/auto-merge.yml
Lines changed: 3 additions & 0 deletions
diff --git a/‎.github/workflows/ci-cd.yml
Lines changed: 109 additions & 0 deletions b/‎.github/workflows/ci-cd.yml
Lines changed: 109 additions & 0 deletions
diff --git a/‎.github/workflows/codeql-analysis.yml
Lines changed: 0 additions & 67 deletions b/‎.github/workflows/codeql-analysis.yml
Lines changed: 0 additions & 67 deletions
diff --git a/‎.github/workflows/django-test.yml
Lines changed: 0 additions & 24 deletions b/‎.github/workflows/django-test.yml
Lines changed: 0 additions & 24 deletions
@@ -1,4 +1,4 @@
-name: Auto Assign Issues
+name: Auto Assign
 
 on:
   issue_comment:
@@ -10,8 +10,10 @@ on:
 jobs:
   auto-assign:
     runs-on: ubuntu-latest
+    permissions: 
+      issues: write
     steps:
       - name: Assign Issues
-        uses: OWASP/BLT-Action@main
+        uses: OWASP-BLT/BLT-Action@main
         with:
-            repo-token: ${{ secrets.GITHUB_TOKEN }}
+            repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -1,12 +1,15 @@
-name: Auto approve PRs by dependabot
+name: Approve dependabot
 
-# Trigger the workflow on pull request
 on: pull_request_target
 
 jobs:
   autoapprove:
-    name: Auto-Approve a PR by dependabot
+    name: Approve dependabot
     runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'dependabot'
+    permissions: 
+      issues: write
+      pull-requests: write
     steps:
       - name: Auto approve
         uses: cognitedata/auto-approve-dependabot-action@v3.0.1
 
@@ -2,13 +2,16 @@ name: auto-merge
 
 on:
   pull_request:
+    types: [opened, synchronize, reopened]
 
 jobs:
   auto-merge:
     runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'dependabot'
     steps:
       - uses: actions/checkout@v2
       - uses: ahmadnassri/action-dependabot-auto-merge@v2
         with:
           target: minor
           github-token: ${{ secrets.ACCESS_TOKEN_DEPENDABOT }}
+
@@ -0,0 +1,109 @@
+name: CI/CD Optimized
+
+on:
+  merge_group:
+  pull_request:
+  push:
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 1
+
+concurrency:
+  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+
+jobs:
+  setup:
+    name: Setup and Cache Dependencies
+    runs-on: ubuntu-latest
+    permissions: 
+      contents: read  # Minimal permission for checking out code
+    outputs:
+      python-cache-dir: ${{ steps.poetry-cache.outputs.dir }}
+    steps:
+      - uses: actions/checkout@v4
+      
+      - name: Cache pre-commit hooks
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: ${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pre-commit-
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11.2
+
+      - name: Get Poetry cache directory
+        id: poetry-cache
+        run: echo "::set-output name=dir::$(poetry config cache-dir)"
+      
+      - name: Cache Poetry dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.poetry-cache.outputs.dir }}
+          key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-poetry-
+
+  pre-commit:
+    name: Run pre-commit
+    needs: setup
+    runs-on: ubuntu-latest
+    permissions: 
+      issues: write
+      pull-requests: write
+      contents: write
+      actions: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.11.2
+      - name: Run pre-commit
+        uses: pre-commit/action@v3.0.1
+
+  code-ql:
+    name: Run CodeQL
+    needs: pre-commit
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      actions: read
+      contents: read
+    strategy:
+      fail-fast: true
+      matrix:
+        language:
+          - 'javascript'
+          - 'python'
+    steps:
+      - uses: actions/checkout@v2
+      - uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+      - uses: github/codeql-action/autobuild@v2
+      - uses: github/codeql-action/analyze@v2
+
+  test:
+    name: Run Tests
+    needs: code-ql
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+      contents: write
+      actions: write
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.11.2
+      - run: pip install poetry
+      - run: poetry install
+      - run: poetry run python manage.py collectstatic --noinput
+      - name: Run tests
+        run: poetry run xvfb-run --auto-servernum python manage.py test -v 3 --failfast