From 2a083da5e5c0b5a122f3baa362df79f0c4a73904 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 16:17:53 +0900 Subject: [PATCH 1/9] fix(ci): restore PR-head CodeQL SARIF for ruleset merge gate CodeQL workflow used upload:never while default setup is not configured, leaving approved PRs blocked on missing CodeQL code-scanning evidence. Upload SARIF on pull_request heads and treat empty gh pr checks --required as a ruleset wait state instead of a hard governance blocker. --- .github/workflows/codeql.yml | 14 +++++++------- backend/tests/test_release_governance.py | 24 +++++++++++++++++++----- scripts/ci/pr_governance_gate.sh | 7 ++++++- scripts/ci/test_pr_governance_gate.sh | 15 +++++++++++++++ 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 642c91e10..0ee2d7626 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,7 +13,6 @@ on: permissions: contents: read - security-events: read jobs: analyze: @@ -22,7 +21,7 @@ jobs: permissions: actions: read contents: read - security-events: read + security-events: write strategy: fail-fast: false matrix: @@ -43,6 +42,7 @@ jobs: uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6 with: persist-credentials: false + ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} - name: Initialize CodeQL uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 @@ -54,8 +54,8 @@ jobs: uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: category: "/language:${{ matrix.language }}" - # This repository uses GitHub CodeQL default setup for code scanning - # uploads. Keep this workflow as CI/Scorecard SAST evidence without - # uploading duplicate CodeQL SARIF, which GitHub rejects while - # default setup is enabled. - upload: never + # Upload PR-head CodeQL SARIF so ruleset code_scanning (CodeQL) can + # evaluate mergeability. Default setup is not configured on this repo. + upload: always + ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} + sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index ab62cd332..33039e5fc 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -323,16 +323,28 @@ def test_bandit_security_scan_does_not_continue_on_error() -> None: assert "continue-on-error: true" not in workflow -def test_codeql_workflow_can_read_security_events_without_uploading_sarif() -> None: +def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: workflow = read_repo_text(".github/workflows/codeql.yml") - assert "permissions:\n contents: read\n security-events: read" in workflow + assert "permissions:\n contents: read\n\njobs:" in workflow assert ( - " permissions:\n actions: read\n contents: read\n security-events: read" + " permissions:\n actions: read\n contents: read\n security-events: write" + in workflow + ) + assert "upload: always" in workflow + assert "upload: never" not in workflow + assert ( + "ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }}" + in workflow + ) + assert ( + "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" + in workflow + ) + assert ( + "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in workflow ) - assert "upload: never" in workflow - assert "security-events: write" not in workflow def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> None: @@ -883,6 +895,8 @@ def test_pr_governance_uses_metadata_only_events_without_checkout_or_admin_merge assert "/issues/${PR_NUMBER}/comments" in gate_script assert "COMMENT_MARKER" in gate_script assert "Waiting for" in gate_script + assert "no required checks reported" in gate_script + assert "ruleset workflows and code-scanning gates" in gate_script assert "reviewThreads" in gate_script assert "CHANGES_REQUESTED" in gate_script assert "gh pr merge" not in gate_script diff --git a/scripts/ci/pr_governance_gate.sh b/scripts/ci/pr_governance_gate.sh index c48f66226..880115b9b 100644 --- a/scripts/ci/pr_governance_gate.sh +++ b/scripts/ci/pr_governance_gate.sh @@ -91,7 +91,12 @@ if [ "$UNRESOLVED_THREADS" != "0" ]; then fi if ! REQUIRED_CHECKS="$(gh pr checks "$PR_NUMBER" --repo "$GITHUB_REPOSITORY" --required --json name,state,link 2>"$PR_CHECKS_ERROR_FILE")"; then - add_blocker "Required check metadata could not be read: $(<"$PR_CHECKS_ERROR_FILE")." + PR_CHECKS_ERROR="$(<"$PR_CHECKS_ERROR_FILE")" + if printf '%s' "$PR_CHECKS_ERROR" | grep -qi 'no required checks reported'; then + add_waiting "Ruleset-governed branch: no legacy required status contexts reported for ${HEAD_REF_OID}; relying on ruleset workflows and code-scanning gates." + else + add_blocker "Required check metadata could not be read: ${PR_CHECKS_ERROR}." + fi else while IFS= read -r item; do [ -n "$item" ] && add_blocker "$item" diff --git a/scripts/ci/test_pr_governance_gate.sh b/scripts/ci/test_pr_governance_gate.sh index c696ebdad..fd3ec353a 100644 --- a/scripts/ci/test_pr_governance_gate.sh +++ b/scripts/ci/test_pr_governance_gate.sh @@ -47,6 +47,10 @@ if [ "$1" = "api" ] && [ "$2" = "graphql" ]; then fi if [ "$1" = "pr" ] && [ "$2" = "checks" ]; then + if [ "${GH_SCENARIO:-pass}" = "no_required_checks" ]; then + printf 'no required checks reported on the test branch\n' >&2 + exit 1 + fi case "${GH_SCENARIO:-pass}" in pending) printf '[{"name":"Application CI","state":"IN_PROGRESS","link":"https://checks/app-ci"}]' @@ -330,6 +334,16 @@ assert_passing_gate_is_metadata_only_without_merge() { assert_not_in_file 'continue-on-error' "$temp_dir/gh.log" } +assert_no_required_checks_waits_without_hard_comment() { + local temp_dir + temp_dir="$(mktemp -d)" + run_gate no_required_checks "$temp_dir" + + assert_in_file 'no legacy required status contexts reported' "$temp_dir/output.txt" + assert_not_in_file 'issues/42/comments -f body' "$temp_dir/gh.log" + assert_not_in_file '^pr merge' "$temp_dir/gh.log" +} + assert_no_comment_or_merge_for_pending_checks assert_startup_failure_creates_marker_comment assert_failed_checks_create_marker_comment @@ -345,5 +359,6 @@ assert_coderabbit_current_review_comment_blocks assert_coderabbit_stale_review_comment_does_not_block assert_changes_requested_creates_marker_comment assert_passing_gate_is_metadata_only_without_merge +assert_no_required_checks_waits_without_hard_comment printf 'test_pr_governance_gate: PASS\n' From 6f2481c50f729f425c1d17f67ff98525a89c7fb0 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 17:39:04 +0900 Subject: [PATCH 2/9] chore(ci): retrigger security scans for merge-preview Scorecard evidence From 3074d43dbc15b9bb80bc819cfe1784ed969f4d65 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 18:20:03 +0900 Subject: [PATCH 3/9] fix(ci): upload merge-preview SARIF for CodeQL and Scorecard gates Ruleset merge checks evaluate refs/pull//merge as well as PR heads. Upload secondary SARIF to the merge preview ref so security-workflow PRs and post-fix develop PRs satisfy code_scanning without admin bypass. --- .github/workflows/codeql.yml | 10 ++++++++++ .github/workflows/scorecard.yml | 9 +++++++++ backend/tests/test_release_governance.py | 5 +++++ 3 files changed, 24 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0ee2d7626..3020150c5 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -51,6 +51,7 @@ jobs: build-mode: ${{ matrix.build-mode }} - name: Perform CodeQL Analysis + id: analyze uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: category: "/language:${{ matrix.language }}" @@ -59,3 +60,12 @@ jobs: upload: always ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + + - name: Upload CodeQL SARIF (merge preview) + if: github.event_name == 'pull_request' + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + with: + sarif_file: ${{ steps.analyze.outputs.sarif-output }} + category: "/language:${{ matrix.language }}-merge" + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} + sha: ${{ github.sha }} diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index f6fc77301..d355d7494 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -59,3 +59,12 @@ jobs: category: scorecard ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + + - name: Upload Scorecard SARIF (merge preview) + if: ${{ github.event_name == 'pull_request' && always() }} + uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + with: + sarif_file: scorecard-results.sarif + category: scorecard-merge + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} + sha: ${{ github.sha }} diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index 33039e5fc..6037d8e8b 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -341,6 +341,8 @@ def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in workflow ) + assert "Upload CodeQL SARIF (merge preview)" in workflow + assert "refs/pull/{0}/merge" in workflow assert ( "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in workflow @@ -405,6 +407,9 @@ def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in scorecard_workflow ) + assert "Upload Scorecard SARIF (merge preview)" in scorecard_workflow + assert "category: scorecard-merge" in scorecard_workflow + assert "refs/pull/{0}/merge" in scorecard_workflow assert ( "aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0" From fcc22f6a54799344cf065d238cabe409e9abfd11 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 19:09:25 +0900 Subject: [PATCH 4/9] fix(ci): split head and merge-preview code-scanning jobs Uploading merge-preview SARIF in the same job conflicts with head uploads. Run dedicated merge-preview CodeQL/Scorecard jobs that scan github.sha and upload to refs/pull//merge. --- .github/workflows/codeql.yml | 48 ++++++++++++++++++++---- .github/workflows/scorecard.yml | 45 ++++++++++++++++++++-- backend/tests/test_release_governance.py | 5 ++- 3 files changed, 86 insertions(+), 12 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 3020150c5..cbd966454 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -15,7 +15,7 @@ permissions: contents: read jobs: - analyze: + analyze-head: name: CodeQL compatibility analysis (${{ matrix.language }}) runs-on: ubuntu-latest permissions: @@ -51,7 +51,6 @@ jobs: build-mode: ${{ matrix.build-mode }} - name: Perform CodeQL Analysis - id: analyze uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: category: "/language:${{ matrix.language }}" @@ -61,11 +60,46 @@ jobs: ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} - - name: Upload CodeQL SARIF (merge preview) - if: github.event_name == 'pull_request' - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + analyze-merge: + name: CodeQL merge preview (${{ matrix.language }}) + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + strategy: + fail-fast: false + matrix: + include: + - language: actions + build-mode: none + - language: javascript-typescript + build-mode: none + - language: python + build-mode: none + steps: + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + with: + egress-policy: audit + + - name: Checkout merge preview + uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6 + with: + persist-credentials: false + ref: ${{ github.sha }} + + - name: Initialize CodeQL + uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: - sarif_file: ${{ steps.analyze.outputs.sarif-output }} category: "/language:${{ matrix.language }}-merge" + upload: always ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ github.sha }} + sha: ${{ github.sha }} \ No newline at end of file diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index d355d7494..148bbe9aa 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -15,7 +15,8 @@ permissions: contents: read jobs: - scorecard: + scorecard-head: + name: scorecard runs-on: ubuntu-latest permissions: actions: read @@ -60,11 +61,49 @@ jobs: ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} + scorecard-merge: + name: scorecard-merge + if: github.event_name == 'pull_request' + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + id-token: write + security-events: write + steps: + - name: Harden the runner (Audit all outbound calls) + uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 + with: + egress-policy: audit + + - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + with: + persist-credentials: false + ref: ${{ github.sha }} + + - name: Run Scorecard + uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 + with: + repo_token: ${{ secrets.GITHUB_TOKEN }} + results_file: scorecard-results.sarif + results_format: sarif + publish_results: false + + - name: Restore Scorecard SARIF ownership + run: | + if [ -e scorecard-results.sarif ]; then + sudo chown "$(id -u):$(id -g)" scorecard-results.sarif + chmod u+rw scorecard-results.sarif + fi + + - name: Preserve Scorecard SARIF categories + run: python scripts/ci/ensure_scorecard_sarif_categories.py scorecard-results.sarif + - name: Upload Scorecard SARIF (merge preview) - if: ${{ github.event_name == 'pull_request' && always() }} + if: ${{ always() }} uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: sarif_file: scorecard-results.sarif category: scorecard-merge ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ github.sha }} + sha: ${{ github.sha }} \ No newline at end of file diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index 6037d8e8b..7dea40a35 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -341,7 +341,8 @@ def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in workflow ) - assert "Upload CodeQL SARIF (merge preview)" in workflow + assert "analyze-merge:" in workflow + assert "CodeQL merge preview" in workflow assert "refs/pull/{0}/merge" in workflow assert ( "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" @@ -407,7 +408,7 @@ def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in scorecard_workflow ) - assert "Upload Scorecard SARIF (merge preview)" in scorecard_workflow + assert "scorecard-merge:" in scorecard_workflow assert "category: scorecard-merge" in scorecard_workflow assert "refs/pull/{0}/merge" in scorecard_workflow From 7a0cb71a39266286efcd727c633c3c37cbcabbcb Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 20:21:32 +0900 Subject: [PATCH 5/9] fix(ci): bind merge-preview scans to refs/pull//merge SHA Use the canonical pull merge ref for checkout and SARIF upload so code-scanning evidence matches the merge commit GitHub rulesets evaluate. --- .github/workflows/codeql.yml | 8 ++++++-- .github/workflows/scorecard.yml | 8 ++++++-- backend/tests/test_release_governance.py | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index cbd966454..1f679afb3 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -88,7 +88,11 @@ jobs: uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v6 with: persist-credentials: false - ref: ${{ github.sha }} + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} + + - name: Resolve merge preview SHA + id: merge_preview + run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Initialize CodeQL uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 @@ -102,4 +106,4 @@ jobs: category: "/language:${{ matrix.language }}-merge" upload: always ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ github.sha }} \ No newline at end of file + sha: ${{ steps.merge_preview.outputs.sha }} \ No newline at end of file diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 148bbe9aa..01ffaab3c 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -79,7 +79,11 @@ jobs: - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 with: persist-credentials: false - ref: ${{ github.sha }} + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} + + - name: Resolve merge preview SHA + id: merge_preview + run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - name: Run Scorecard uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 @@ -106,4 +110,4 @@ jobs: sarif_file: scorecard-results.sarif category: scorecard-merge ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ github.sha }} \ No newline at end of file + sha: ${{ steps.merge_preview.outputs.sha }} \ No newline at end of file diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index 7dea40a35..c71aeef16 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -343,6 +343,7 @@ def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: ) assert "analyze-merge:" in workflow assert "CodeQL merge preview" in workflow + assert "Resolve merge preview SHA" in workflow assert "refs/pull/{0}/merge" in workflow assert ( "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" @@ -409,6 +410,7 @@ def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> in scorecard_workflow ) assert "scorecard-merge:" in scorecard_workflow + assert "Resolve merge preview SHA" in scorecard_workflow assert "category: scorecard-merge" in scorecard_workflow assert "refs/pull/{0}/merge" in scorecard_workflow From 596f7d2d2ac32df9e481e52151b238d1dee4956c Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 21:41:55 +0900 Subject: [PATCH 6/9] fix(ci): omit ephemeral merge SHA from merge-ref SARIF uploads GitHub rotates pull-request merge preview SHAs; pinning uploads to a resolved SHA left Scorecard evidence on stale commits. Upload to refs/pull//merge without an explicit sha so analyses track the ref. --- .github/workflows/codeql.yml | 8 +------- .github/workflows/scorecard.yml | 7 +------ backend/tests/test_release_governance.py | 2 -- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1f679afb3..2f95a32c4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -90,10 +90,6 @@ jobs: persist-credentials: false ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - - name: Resolve merge preview SHA - id: merge_preview - run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - - name: Initialize CodeQL uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: @@ -104,6 +100,4 @@ jobs: uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: category: "/language:${{ matrix.language }}-merge" - upload: always - ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ steps.merge_preview.outputs.sha }} \ No newline at end of file + upload: always \ No newline at end of file diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 01ffaab3c..f1f43d2ec 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -81,10 +81,6 @@ jobs: persist-credentials: false ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - - name: Resolve merge preview SHA - id: merge_preview - run: echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT" - - name: Run Scorecard uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 with: @@ -109,5 +105,4 @@ jobs: with: sarif_file: scorecard-results.sarif category: scorecard-merge - ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - sha: ${{ steps.merge_preview.outputs.sha }} \ No newline at end of file + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} \ No newline at end of file diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index c71aeef16..7dea40a35 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -343,7 +343,6 @@ def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: ) assert "analyze-merge:" in workflow assert "CodeQL merge preview" in workflow - assert "Resolve merge preview SHA" in workflow assert "refs/pull/{0}/merge" in workflow assert ( "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" @@ -410,7 +409,6 @@ def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> in scorecard_workflow ) assert "scorecard-merge:" in scorecard_workflow - assert "Resolve merge preview SHA" in scorecard_workflow assert "category: scorecard-merge" in scorecard_workflow assert "refs/pull/{0}/merge" in scorecard_workflow From 0ad21667b2cc2dc11e60f7d4c39dc311edda6e49 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 21:42:12 +0900 Subject: [PATCH 7/9] fix(ci): keep scorecard workflow unchanged on CodeQL gate PR Limit PR #912 to CodeQL and governance gate fixes so merge-preview Scorecard churn on workflow edits does not block landing the gate repair. --- .github/workflows/scorecard.yml | 49 +-------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-) diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index f1f43d2ec..f6fc77301 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -15,8 +15,7 @@ permissions: contents: read jobs: - scorecard-head: - name: scorecard + scorecard: runs-on: ubuntu-latest permissions: actions: read @@ -60,49 +59,3 @@ jobs: category: scorecard ref: ${{ github.event_name == 'pull_request' && format('refs/pull/{0}/head', github.event.pull_request.number) || github.ref }} sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }} - - scorecard-merge: - name: scorecard-merge - if: github.event_name == 'pull_request' - runs-on: ubuntu-latest - permissions: - actions: read - contents: read - id-token: write - security-events: write - steps: - - name: Harden the runner (Audit all outbound calls) - uses: step-security/harden-runner@9af89fc71515a100421586dfdb3dc9c984fbf411 # v2.19.4 - with: - egress-policy: audit - - - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 - with: - persist-credentials: false - ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} - - - name: Run Scorecard - uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - results_file: scorecard-results.sarif - results_format: sarif - publish_results: false - - - name: Restore Scorecard SARIF ownership - run: | - if [ -e scorecard-results.sarif ]; then - sudo chown "$(id -u):$(id -g)" scorecard-results.sarif - chmod u+rw scorecard-results.sarif - fi - - - name: Preserve Scorecard SARIF categories - run: python scripts/ci/ensure_scorecard_sarif_categories.py scorecard-results.sarif - - - name: Upload Scorecard SARIF (merge preview) - if: ${{ always() }} - uses: github/codeql-action/upload-sarif@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 - with: - sarif_file: scorecard-results.sarif - category: scorecard-merge - ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} \ No newline at end of file From 86611f5871c82e77728cb951bcd97458bbc1fad7 Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 21:42:26 +0900 Subject: [PATCH 8/9] test: align scorecard governance assertions with develop workflow --- backend/tests/test_release_governance.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index 7dea40a35..ae197de16 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -408,9 +408,7 @@ def test_required_code_scanning_workflows_upload_scorecard_and_trivy_sarif() -> "sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in scorecard_workflow ) - assert "scorecard-merge:" in scorecard_workflow - assert "category: scorecard-merge" in scorecard_workflow - assert "refs/pull/{0}/merge" in scorecard_workflow + assert ( "aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0" From 7e13e03824c52d26137635f4152f67cd1631a6ad Mon Sep 17 00:00:00 2001 From: Seongho Bae Date: Sat, 4 Jul 2026 23:02:43 +0900 Subject: [PATCH 9/9] fix(ci): upload CodeQL merge SARIF to merge_commit_sha Ruleset code_scanning evaluates pull_request.merge_commit_sha, which can differ from the ephemeral SHA refs/pull//merge resolves to during SARIF upload. Pin merge-preview upload ref/sha to the PR merge commit. --- .github/workflows/codeql.yml | 6 +++++- backend/tests/test_release_governance.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2f95a32c4..68d541d01 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -100,4 +100,8 @@ jobs: uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4 with: category: "/language:${{ matrix.language }}-merge" - upload: always \ No newline at end of file + upload: always + # Ruleset code_scanning evaluates merge_commit_sha, which can differ + # from the ephemeral SHA refs/pull//merge resolves to at upload time. + ref: ${{ format('refs/pull/{0}/merge', github.event.pull_request.number) }} + sha: ${{ github.event.pull_request.merge_commit_sha }} \ No newline at end of file diff --git a/backend/tests/test_release_governance.py b/backend/tests/test_release_governance.py index ae197de16..9a4ec97df 100644 --- a/backend/tests/test_release_governance.py +++ b/backend/tests/test_release_governance.py @@ -344,6 +344,7 @@ def test_codeql_workflow_uploads_pr_head_sarif_for_ruleset_gate() -> None: assert "analyze-merge:" in workflow assert "CodeQL merge preview" in workflow assert "refs/pull/{0}/merge" in workflow + assert "github.event.pull_request.merge_commit_sha" in workflow assert ( "ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}" in workflow