Merge branch 'main' into julio/versioning/remove-manual-changelog-modifications

hoolioh · web-flow · commit 5993a1cea26b · 2026-01-27T10:45:05.000+01:00
diff --git a/.github/workflows/pr-metadata-docs-and-deps.yml b/.github/workflows/pr-metadata-docs-and-deps.yml
@@ -4,6 +4,7 @@ permissions:
   pull-requests: read
 on:
   pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
     branches-ignore:
       - "v[0-9]+.[0-9]+.[0-9]+.[0-9]+"
       - release
@@ -166,6 +167,64 @@ jobs:
         body-path: doc-check-results.md
         edit-mode: replace
 
+  changelog-check:
+    needs: changed-crates
+    if: |
+      needs.changed-crates.outputs.crates_count > 0 &&
+      !contains(github.event.pull_request.labels.*.name, 'skip-changelog-check')
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
+      with:
+        fetch-depth: 0  # Need full history for git diff
+    - name: Check for CHANGELOG.md changes in publishable crates
+      run: |
+        # Get the base ref for comparison
+        BASE_REF='${{ needs.changed-crates.outputs.base_ref }}'
+
+        # Get the list of changed crates
+        CRATES='${{ needs.changed-crates.outputs.crates }}'
+
+        FAILED=0
+        MODIFIED_CHANGELOGS=()
+
+        while read -r crate; do
+          NAME=$(echo "$crate" | jq -r '.name')
+          CRATE_PATH=$(echo "$crate" | jq -r '.path')
+          CHANGELOG_PATH="$CRATE_PATH/CHANGELOG.md"
+
+          # Check if CHANGELOG.md exists
+          if [[ ! -f "$CHANGELOG_PATH" ]]; then
+            # This shouldn't happen, skipping for now.
+            continue
+          fi
+
+          # Check if CHANGELOG.md has been modified in this PR
+          if git diff --name-only "$BASE_REF" HEAD | grep -q "^$CHANGELOG_PATH$"; then
+            MODIFIED_CHANGELOGS+=("$NAME ($CHANGELOG_PATH)")
+            FAILED=1
+          fi
+        done < <(echo "$CRATES" | jq -c '.[]')
+
+        if [[ $FAILED -eq 1 ]]; then
+          echo ""
+          echo "=========================================="
+          echo "ERROR: CHANGELOG.md files modified in publishable crates"
+          echo "=========================================="
+          echo ""
+          echo "The following publishable crates have CHANGELOG.md changes:"
+          for changelog in "${MODIFIED_CHANGELOGS[@]}"; do
+            echo "  - $changelog"
+          done
+          echo ""
+          echo "CHANGELOG.md files should only be updated during the release process."
+          echo "Please revert the CHANGELOG.md changes from this PR."
+          exit 1
+        fi
+
+        echo ""
+        echo "No CHANGELOG.md changes detected in publishable crates"
+
   dependency-check:
     needs: changed-crates
     if: needs.changed-crates.outputs.crates_count > 0
diff --git a/.github/workflows/pr-title-semver-check.yml b/.github/workflows/pr-title-semver-check.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
-  RUST_VERSION: stable
+  RUST_VERSION: 1.92.0
 
 jobs:
   detect-changes:
@@ -111,7 +111,7 @@ jobs:
           set -euo pipefail
 
           CHANGED_CRATES='${{ needs.detect-changes.outputs.changed_crates }}'
-          BASELINE="origin/main"
+          BASELINE="main"
           HIGHEST_LEVEL=""
 
           # Parse JSON array
diff --git a/scripts/semver-level.sh b/scripts/semver-level.sh
@@ -55,8 +55,14 @@ compute_semver_results() {
     # Fetch base commit
     git fetch origin "$baseline" --depth=50 --quiet
 
+    # Ensure baseline has origin/ prefix if it doesn't already
+    if [[ ! "$baseline" =~ ^origin/ ]]; then
+        baseline="origin/$baseline"
+    fi
+
     log_verbose "========================================" >&2
     log_verbose "Checking semver for: $crate" >&2
+    log_verbose "Using baseline ref: $baseline" >&2
     log_verbose "========================================" >&2
 
     LEVEL="none"
