Skip to content

Fix catalog CodeQL upload conflict with default setup #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yousefi-msft wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

Fix catalog CodeQL upload conflict with default setup #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .github/tests/test_security_automation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,7 @@ def test_codeql_matrix_keeps_scopes_separate_and_supported():
"/language:${{ matrix.language }}/scope:${{ matrix.scope }}"
)
assert analyze_step["with"]["output"] == "codeql-results"
assert analyze_step["with"]["upload"] == (
"${{ github.event_name != 'pull_request' || "
"github.event.pull_request.head.repo.full_name == github.repository }}"
)
assert analyze_step["with"]["upload"] == "false"
artifact_step = next(
step for step in codeql_job["steps"]
if step.get("name") == "Upload CodeQL SARIF artifact"
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/code-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ name: Code Scan
#
# Rollout posture: reporting, not gating. Pointing three new analyzers at 46
# pre-existing agents would produce a flood of findings that blocks unrelated
# contributions. Results land in the Security tab and the job summary; promote
# to blocking once the backlog is triaged, the same way the rule engine's
# ratchet works.
# contributions. Findings are retained as downloadable artifacts; promote to
# blocking once the backlog is triaged, the same way the rule engine's ratchet
# works.

on:
pull_request:
Expand Down Expand Up @@ -77,7 +77,10 @@ jobs:
with:
category: "/language:${{ matrix.language }}/scope:${{ matrix.scope }}"
output: codeql-results
upload: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
# This repository has CodeQL default setup enabled, which rejects
# SARIF uploads from advanced configurations. Keep the scoped scan
# and publish its SARIF through the artifact step below instead.
upload: false

- name: Upload CodeQL SARIF artifact
if: always()
Expand Down
Loading