Merge branch 'main' into prover/fix/stateroot-binding

Author: Tabaie

.github/actions/run-git-cliff-commands/action.yml

@@ -19,10 +19,13 @@ inputs:
 
       Blank/whitespace-only lines are ignored; leading/trailing whitespace on each line is trimmed.
     required: true
-  cliff-config:
-    description: "Path to the cliff.toml config file"
+  scopes:
+    description: "Regex alternation of conventional-commit scopes to gate on, injected into the shared template (e.g. 'coordinator' or 'linea-besu|tracer|sequencer|deps|misc')"
+    required: true
+  cliff-template:
+    description: "Path to the shared git-cliff template containing the @@SCOPES@@ placeholder"
     required: false
-    default: "cliff.toml"
+    default: "cliff.template.toml"
   release_tag_suffix:
     description: "Custom release tag suffix, i.e. release tag would be releases/[component]/v[semver]-[suffix]"
     required: false
@@ -70,13 +73,35 @@ runs:
           echo '__PATHS_EOF__'
         } >> "$GITHUB_OUTPUT"
 
+    # Render the shared cliff template into a temp config with the caller's
+    # scopes injected into the @@SCOPES@@ placeholder. git-cliff can't inject
+    # scopes into commit_parsers itself, so we substitute at run time and point
+    # every git cliff invocation below at the rendered file.
+    - name: Render git-cliff config with injected scopes
+      id: render
+      shell: bash
+      env:
+        SCOPES: ${{ inputs.scopes }}
+        TEMPLATE: ${{ inputs.cliff-template }}
+      run: |
+        set -euo pipefail
+        if [ -z "${SCOPES}" ]; then
+          echo "scopes input must be non-empty" >&2
+          exit 1
+        fi
+        rendered="${RUNNER_TEMP:-/tmp}/cliff.rendered.toml"
+        # '#' delimiter is safe: neither the placeholder nor scope tokens (which
+        # may contain '|') contain '#'.
+        sed "s#@@SCOPES@@#${SCOPES}#g" "${TEMPLATE}" > "${rendered}"
+        echo "config=${rendered}" >> "$GITHUB_OUTPUT"
+
     # Compute the next release version
     - name: Compute next ${{ inputs.component-name }} version (semver)
       id: version
       shell: bash
       env:
         COMPONENT: ${{ inputs.component-name }}
-        CLIFF_CONFIG: ${{ inputs.cliff-config }}
+        CLIFF_CONFIG: ${{ steps.render.outputs.config }}
         RELEASE_TAG_SUFFIX: ${{ inputs.release_tag_suffix }}
       run: |
         set -euo pipefail
@@ -147,7 +172,7 @@ runs:
       if: steps.version.outputs.changed == 'true'
       env:
         COMPONENT: ${{ inputs.component-name }}
-        CLIFF_CONFIG: ${{ inputs.cliff-config }}
+        CLIFF_CONFIG: ${{ steps.render.outputs.config }}
         TAG_CONFIG: ${{ inputs.generate-changelog-with-next-tag-version == 'true' && format(' --tag {0}', steps.version.outputs.version) || '' }}
       shell: bash
       run: |
@@ -171,7 +196,7 @@ runs:
       env:
         COMPONENT: ${{ inputs.component-name }}
         FOLDER_NAME: ${{ inputs.folder-name }}
-        CLIFF_CONFIG: ${{ inputs.cliff-config }}
+        CLIFF_CONFIG: ${{ steps.render.outputs.config }}
         TAG_CONFIG: ${{ inputs.generate-changelog-with-next-tag-version == 'true' && format(' --tag {0}', steps.version.outputs.version) || '' }}
         TARGET_REF: ${{ github.head_ref || github.ref_name }}
       shell: bash

.github/workflows/component-changelog-upload.yml

@@ -67,24 +67,32 @@ jobs:
       matrix:
         component: [ coordinator, maru, prover, postman, tx-exclusion-api, linea-besu-package, linea ]
         include:
+          # Scope-and-path gated: cliff-<component>.toml keeps only commits
+          # scoped to that component, AND include-path restricts to its paths.
           - component: coordinator
             folder-name: coordinator
+            scopes: coordinator|deps|misc
             include-path: coordinator/**
           - component: maru
             folder-name: maru
+            scopes: maru|deps|misc
             include-path: maru/**
           - component: prover
             folder-name: prover
+            scopes: prover|deps|misc
             include-path: prover/**
           - component: postman
             folder-name: postman
+            scopes: postman|deps|misc
             include-path: postman/**
           - component: tx-exclusion-api
             folder-name: transaction-exclusion-api
+            scopes: tx-exclusion-api|deps|misc
             include-path: transaction-exclusion-api/**
           - component: linea-besu-package
             folder-name: linea-besu/package
             artifact-name: linea-besu-package
+            scopes: linea-besu|tracer|sequencer|deps|misc
             include-path: |
               tracer/**
               tracer-constraints/**
@@ -95,8 +103,10 @@ jobs:
           - component: linea
             folder-name: .
             artifact-name: linea
+            scopes: coordinator|linea-besu|tracer|sequencer|maru|prover|postman|tx-exclusion-api|deps|misc
             include-path: |
               coordinator/**
+              maru/**
               postman/**
               prover/**
               transaction-exclusion-api/**
@@ -134,6 +144,7 @@ jobs:
           component-name: ${{ matrix.component }}
           folder-name: ${{ matrix.folder-name }}
           include-path: ${{ matrix.include-path }}
+          scopes: ${{ matrix.scopes }}
           prepend-changelog: 'true'
 
       - name: Upload CHANGELOG.md artifact

.github/workflows/coordinator-release.yml

@@ -35,6 +35,9 @@ jobs:
     with:
       component-name: coordinator
       folder-name: coordinator
+      # Scope-and-path gated: the shared cliff.template.toml (scope `coordinator`) keeps only `coordinator`-scoped
+      # commits, AND include-path restricts to the coordinator paths.
+      scopes: coordinator|deps|misc
       include-path: coordinator/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }}

.github/workflows/linea-besu-release.yml

@@ -51,6 +51,10 @@ jobs:
     with:
       # Release tag uses 'linea-besu-package' (e.g. releases/linea-besu-package/v1.2.3)
       component-name: linea-besu-package
+      # Scope-and-path gated: the shared cliff.template.toml (scopes `linea-besu|tracer|sequencer|deps|misc`)
+      # keeps only commits scoped to `linea-besu`, AND include-path restricts to the linea-besu package paths;
+      # a commit must satisfy both to drive the version bump and changelog.
+      scopes: linea-besu|tracer|sequencer|deps|misc
       include-path: |
         tracer/**
         tracer-constraints/**

.github/workflows/linea-milestone-release.yml

@@ -186,6 +186,7 @@ jobs:
     with:
       component-name: coordinator
       folder-name: coordinator
+      scopes: coordinator|deps|misc
       include-path: coordinator/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }} # no release tag suffix should be allowed for milestone component release, only for dry run cases
@@ -205,6 +206,7 @@ jobs:
     with:
       component-name: prover
       folder-name: prover
+      scopes: prover|deps|misc
       include-path: prover/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }} # no release tag suffix should be allowed for milestone component release, only for dry run cases
@@ -224,6 +226,7 @@ jobs:
     with:
       component-name: postman
       folder-name: postman
+      scopes: postman|deps|misc
       include-path: postman/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }} # no release tag suffix should be allowed for milestone component release, only for dry run cases
@@ -243,6 +246,7 @@ jobs:
     with:
       component-name: tx-exclusion-api
       folder-name: transaction-exclusion-api
+      scopes: tx-exclusion-api|deps|misc
       include-path: transaction-exclusion-api/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }} # non-empty release_tag_suffix can be only for non-main milestone release (e.g. dry run release)
@@ -262,6 +266,7 @@ jobs:
     with:
       component-name: maru
       folder-name: maru
+      scopes: maru|deps|misc
       include-path: maru/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }} # no release tag suffix should be allowed for milestone component release, only for dry run cases

.github/workflows/maru-release.yml

@@ -35,6 +35,9 @@ jobs:
     with:
       component-name: maru
       folder-name: maru
+      # Scope-and-path gated: the shared cliff.template.toml (scope `maru`) keeps only `maru`-scoped commits,
+      # AND include-path restricts to the maru paths.
+      scopes: maru|deps|misc
       include-path: maru/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }}

.github/workflows/postman-release.yml

@@ -35,6 +35,9 @@ jobs:
     with:
       component-name: postman
       folder-name: postman
+      # Scope-and-path gated: the shared cliff.template.toml (scope `postman`) keeps only `postman`-scoped
+      # commits, AND include-path restricts to the postman paths.
+      scopes: postman|deps|misc
       include-path: postman/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }}

.github/workflows/prover-release.yml

@@ -36,6 +36,9 @@ jobs:
     with:
       component-name: prover
       folder-name: prover
+      # Scope-and-path gated: the shared cliff.template.toml (scope `prover`) keeps only `prover`-scoped
+      # commits, AND include-path restricts to the prover paths.
+      scopes: prover|deps|misc
       include-path: prover/**
       image_tag_suffix: ${{ inputs.image_tag_suffix }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }}

.github/workflows/reusable-component-gh-release.yml

@@ -21,6 +21,10 @@ on:
         description: 'newline-separated string to represent the "git-cliff --include-path filter"'
         required: true
         type: string
+      scopes:
+        description: "Regex alternation of conventional-commit scopes to gate on (e.g. 'coordinator' or 'linea-besu|tracer|sequencer|deps|misc')"
+        required: true
+        type: string
       image_tag_suffix:
         description: 'Custom docker image tag suffix, i.e. docker image tag would be [semver]-[YYYYMMDD]-[commit]-[suffix], if not given, would be [semver]-[YYYYMMDD]-[commit]'
         required: false
@@ -66,6 +70,7 @@ jobs:
       component-name: ${{ inputs.component-name }}
       folder-name: ${{ inputs.folder-name }}
       include-path: ${{ inputs.include-path }}
+      scopes: ${{ inputs.scopes }}
       release_tag_suffix: ${{ inputs.release_tag_suffix }}
       upload_changelog: ${{ inputs.upload_changelog }}
     secrets: inherit

.github/workflows/reusable-component-release-metadata.yml

@@ -10,6 +10,10 @@ on:
       include-path:
         description: 'newline-separated string to represent the "git-cliff --include-path filter"'
         type: string
+      scopes:
+        description: "Regex alternation of conventional-commit scopes to gate on (e.g. 'coordinator' or 'linea-besu|tracer|sequencer|deps|misc')"
+        required: true
+        type: string
       release_tag_suffix:
         description: "Custom release tag suffix, i.e. release tag would be releases/[component]/v[semver]-[suffix]"
         required: false
@@ -57,6 +61,7 @@ jobs:
         with:
           component-name: ${{ inputs.component-name }}
           include-path: ${{ inputs.include-path }}
+          scopes: ${{ inputs.scopes }}
           release_tag_suffix: ${{ inputs.release_tag_suffix }}
           generate-changelog-with-next-tag-version: 'true'