From b2e9c025002d35237e7f0c88dd5c828d1da58981 Mon Sep 17 00:00:00 2001 From: horsenuggets Date: Tue, 13 Jan 2026 17:05:57 -0800 Subject: [PATCH] Add diff-check back to release workflow Ensure release PRs exactly match main before merging. --- .github/workflows/release-checks.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/release-checks.yml b/.github/workflows/release-checks.yml index 8460156..f51eaad 100644 --- a/.github/workflows/release-checks.yml +++ b/.github/workflows/release-checks.yml @@ -23,6 +23,32 @@ jobs: echo "PR title is valid." + diff-check: + name: Verify diff matches main + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + submodules: true + + - name: Check diff with main + run: | + git fetch origin main + + # Get the diff between the PR branch and main + DIFF=$(git diff origin/main..HEAD) + + if [ -n "$DIFF" ]; then + echo "::error::PR branch has changes that differ from main. The release branch must contain exactly what is in main." + echo "Diff:" + echo "$DIFF" + exit 1 + fi + + echo "PR branch matches main exactly." + format: name: Check formatting runs-on: ubuntu-latest