File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 99 delete-merged-branch :
1010 name : 🗑️ Delete merged branch
1111 runs-on : ubuntu-latest
12- if : github.event.pull_request.merged == true
12+ if : |
13+ github.event.pull_request.merged == true &&
14+ github.event.pull_request.head.repo.full_name == github.repository
1315 permissions :
1416 contents : write
1517
3234 esac
3335
3436 echo "🗑️ Deleting merged branch: $BRANCH_NAME"
35- gh api "repos/${{ github.repository }}/git/refs/heads/${BRANCH_NAME}" --method DELETE
36- echo "✅ Branch '$BRANCH_NAME' deleted successfully."
37+ gh api "repos/${{ github.repository }}/git/refs/heads/${BRANCH_NAME}" --method DELETE \
38+ || echo "⚠️ Could not delete branch '$BRANCH_NAME' (already removed or from a fork)."
39+ echo "✅ Branch '$BRANCH_NAME' cleanup completed."
Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ jobs:
152152 security-summary :
153153 name : 📋 Security Summary
154154 runs-on : ubuntu-latest
155- needs : [codeql, snyk]
155+ needs : [codeql, snyk, sonarqube ]
156156 if : always()
157157
158158 steps :
@@ -164,17 +164,17 @@ jobs:
164164 echo "|------|--------|" >> $GITHUB_STEP_SUMMARY
165165 echo "| 🔍 CodeQL | ${{ needs.codeql.result }} |" >> $GITHUB_STEP_SUMMARY
166166 echo "| 🛡️ Snyk | ${{ needs.snyk.result }} |" >> $GITHUB_STEP_SUMMARY
167- echo "| 📊 SonarQube | ${{ contains( needs.* .result, 'skipped') && 'skipped' || 'N/A' }} |" >> $GITHUB_STEP_SUMMARY
167+ echo "| 📊 SonarQube | ${{ needs.sonarqube .result }} |" >> $GITHUB_STEP_SUMMARY
168168 echo "" >> $GITHUB_STEP_SUMMARY
169169
170- if [[ "${{ needs.codeql.result }}" == "failure" || "${{ needs.snyk.result }}" == "failure" ]]; then
170+ if [[ "${{ needs.codeql.result }}" == "failure" || "${{ needs.snyk.result }}" == "failure" || "${{ needs.sonarqube.result }}" == "failure" ]]; then
171171 echo "❌ **Security issues detected! Please review the scan results.**" >> $GITHUB_STEP_SUMMARY
172172 else
173173 echo "✅ **All security scans passed successfully!**" >> $GITHUB_STEP_SUMMARY
174174 fi
175175
176176 - name : 🚨 Security Alert
177- if : needs.codeql.result == 'failure' || needs.snyk.result == 'failure'
177+ if : needs.codeql.result == 'failure' || needs.snyk.result == 'failure' || needs.sonarqube.result == 'failure'
178178 run : |
179179 echo "🚨 SECURITY ISSUES DETECTED!"
180180 echo "Please review the security scan results immediately."
You can’t perform that action at this time.
0 commit comments