changes in lint.yml file

Author: Harsh Srivastava

.github/workflows/lint.yml

@@ -2,8 +2,7 @@ name: Python Lint
 'on':
   push:
     branches:
-      - master
-      - private/harsh/soc2-scan
+      - main
       - private/soc2
   pull_request:
 
@@ -23,50 +22,69 @@ jobs:
     name: Ruff Lint & Auto PR
     needs: setup
     runs-on: ubuntu-latest
+    outputs:
+      ruff-issues-found: ${{ steps.scan.outputs.ruff_issues_found }}
     permissions:
-        contents: write
-        pull-requests: write
+      contents: write
+      pull-requests: write
 
     steps:
-        - name: Checkout code
-          uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '${{ needs.setup.outputs.python-version }}'
+
+      - name: Install Ruff
+        run: pip install ruff
+
+      - name: Sanitize branch name
+        run: echo "SAFE_REF_NAME=${GITHUB_REF_NAME//\//-}" >> $GITHUB_ENV
 
-        - name: Set up Python
-          uses: actions/setup-python@v4
-          with:
-            python-version: ${{ needs.setup.outputs.python-version }}
+      - name: Run Ruff Lint Scan
+        id: scan
+        run: |
+          echo "Running Ruff lint scan..."
+          mkdir -p tmp
+          ruff check . --select E,F,I --output-format=json > tmp/ruff_output.json || true
+          echo -e "\nHuman-readable Ruff output:\n"
+          ruff check . --select E,F,I || true
+          cat tmp/ruff_output.json || echo "[]"
+          
+          issue_count=$(jq 'length' tmp/ruff_output.json || echo 0)
+          
+          if [[ "$issue_count" -gt 0 ]]; then
+            echo "ruff_issues_found=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "ruff_issues_found=false" >> "$GITHUB_OUTPUT"
+          fi
 
-        - name: Install Ruff
-          run: pip install ruff
+      - name: Upload Ruff Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: ruff-json-${{ env.SAFE_REF_NAME }}
+          path: tmp/ruff_output.json
 
-        - name: Run Ruff
-          id: ruff
-          run: |
-            echo "🔍 Running Ruff Lint..."
-            ruff check . --select E,F,I > ruff_output.txt || true
-            cat ruff_output.txt
-            if [ -s ruff_output.txt ]; then
-            echo "ruff_issues=true" >> "$GITHUB_OUTPUT"
-            else
-            echo "ruff_issues=false" >> "$GITHUB_OUTPUT"
-            fi
+      - name: Generate PR Body (if issues found)
+        if: ${{ steps.scan.outputs.ruff_issues_found == 'true' }}
+        run: |
+          echo "# Ruff Lint Report for branch \`${GITHUB_REF_NAME}\`" > tmp/pr-body.md
+          jq -r '.[] | "* File: \(.filename)\n  • Line: \(.location.row)\n  • Column: \(.location.column)\n  • Rule: \(.code)\n  • Message: \(.message)\n"' \
+            tmp/ruff_output.json >> tmp/pr-body.md
 
-        - name: Create PR if Issues Found
-          if: ${{ steps.ruff.outputs.ruff_issues == 'true' }}
-          uses: peter-evans/create-pull-request@v5
-          with:
-            commit-message: 'chore: fix ruff lint issues'
-            title: 'chore: Ruff Lint Issues Found'
-            body: |
-                ## ⚠️ Ruff Lint Issues Found
-                See `.ruff_output.txt` for full details.
-                branch: auto/ruff-lint-issues
-                base: atherton
-                add-paths: |
-                ruff_output.txt
+      - name: Create Pull Request (if issues found)
+        if: ${{ github.event_name == 'push' && steps.scan.outputs.ruff_issues_found == 'true' }}
+        uses: peter-evans/create-pull-request@v5
+        with:
+          commit-message: 'chore: Ruff lint issues detected'
+          title: 'Ruff Lint Report for branch ${{ github.ref_name }}'
+          body-path: tmp/pr-body.md
+          branch: auto/ruff-lint/${{ env.SAFE_REF_NAME }}
+          base: ${{ github.ref_name }}
+          delete-branch: true
 
-        - name: Fail job if issues found
-          if: ${{ steps.ruff.outputs.ruff_issues == 'true' }}
-          run: |
-            echo "❌ Ruff lint issues found — failing job."
-            exit 1
+      - name: Fail Job If Issues Found
+        if: ${{ steps.scan.outputs.ruff_issues_found == 'true' }}
+        run: exit 1

.github/workflows/security-scan.yml

@@ -3,7 +3,6 @@ name: Python Security scan
   push:
     branches:
       - master
-      - private/harsh/soc2-scan
       - private/soc2
   pull_request: