Merge branch 'alexggh/statement-store-not-api' into ae-sss-latency-bench-cli

Author: AndreiEres

.github/scripts/release/release_lib.sh

@@ -29,7 +29,7 @@ commit_with_message() {
 # input: none
 # output: list of filtered runtimes
 get_filtered_runtimes_list() {
-    grep_filters=("runtime.*" "test|template|starters|substrate")
+    grep_filters=("runtime.*" "test|template|starters|substrate|docs")
 
     git grep spec_version: | grep .rs: | grep -e "${grep_filters[0]}" | grep "lib.rs" | grep -vE "${grep_filters[1]}" | cut -d: -f1
 }
@@ -91,13 +91,20 @@ function get_spec_version() {
 reorder_prdocs() {
     VERSION="$1"
 
-    printf "[+] ℹ️ Reordering prdocs:"
+    printf "[+] ℹ️ Reordering prdocs:\n"
 
     VERSION=$(sed -E 's/^v([0-9]+\.[0-9]+\.[0-9]+).*$/\1/' <<< "$VERSION") #getting reed of the 'v' prefix
-    mkdir -p "prdoc/$VERSION"
-    mv prdoc/pr_*.prdoc prdoc/$VERSION
-    git add -A
-    commit_with_message "Reordering prdocs for the release $VERSION"
+
+    # Check if there are any prdoc files to move
+    if ls prdoc/pr_*.prdoc 1> /dev/null 2>&1; then
+        mkdir -p "prdoc/$VERSION"
+        mv prdoc/pr_*.prdoc prdoc/$VERSION
+        git add -A
+        commit_with_message "Reordering prdocs for the release $VERSION"
+        echo "✅ Successfully reordered prdocs"
+    else
+        echo "⚠️ No prdoc files found to reorder"
+    fi
 }
 
 # Bump the binary version of the polkadot-parachain binary with the
@@ -204,3 +211,50 @@ function get_s3_url_base() {
         ;;
     esac
 }
+
+# Bump spec_version in a runtime file based on release type
+# For patch release: bump last 3 digits (patch part) by 1
+# For new stable release: bump middle part (minor) by 1, reset patch to 0
+#
+# input:
+#   - file: path to the runtime file
+#   - is_patch_release: "true" for patch release, "false" for new stable
+# output: prints the new spec_version, modifies file in place
+bump_spec_version() {
+    local file=$1
+    local is_patch_release=$2
+
+    # Extract current spec_version from file (format: X_YYY_ZZZ)
+    local current_spec=$(grep -oP 'spec_version:\s*\K[0-9]+_[0-9]+_[0-9]+' "$file" | head -1)
+
+    if [ -z "$current_spec" ]; then
+        echo "⚠️  Warning: Could not find spec_version in $file"
+        return 1
+    fi
+
+    # Parse the spec_version (format: X_YYY_ZZZ)
+    local major=$(echo "$current_spec" | cut -d'_' -f1)
+    local minor=$(echo "$current_spec" | cut -d'_' -f2)
+    local patch=$(echo "$current_spec" | cut -d'_' -f3)
+
+    # Remove leading zeros for arithmetic
+    minor=$((10#$minor))
+    patch=$((10#$patch))
+
+    if [ "$is_patch_release" = "true" ]; then
+        # Patch release: bump patch part by 1
+        patch=$((patch + 1))
+    else
+        # New stable release: bump minor by 1, reset patch to 0
+        minor=$((minor + 1))
+        patch=0
+    fi
+
+    # Format back to X_YYY_ZZZ format (with proper zero padding)
+    local new_spec=$(printf "%d_%03d_%03d" "$major" "$minor" "$patch")
+
+    # Replace in file
+    sed -ri "s/spec_version: ${current_spec},/spec_version: ${new_spec},/" "$file"
+
+    echo "$new_spec"
+}

.github/workflows/release-20_build-rc.yml

@@ -40,7 +40,7 @@ jobs:
 
   validate-inputs:
     needs: [check-synchronization]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
         release_tag: ${{ steps.validate_inputs.outputs.release_tag }}

.github/workflows/release-21_build-runtimes.yml

@@ -60,7 +60,7 @@ jobs:
 
   validate-inputs:
     needs: [check-synchronization]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
         release_tag: ${{ steps.validate_inputs.outputs.release_tag }}

.github/workflows/release-22_combined-rc-runtime-builds-release-draft.yml

@@ -61,7 +61,7 @@ jobs:
 
   validate-inputs:
     needs: [check-synchronization]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
       release_tag: ${{ steps.validate_inputs.outputs.release_tag }}

.github/workflows/release-30_publish_release_draft.yml

@@ -63,7 +63,7 @@ jobs:
 
   validate-inputs:
     needs: [ check-synchronization ]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
         release_tag: ${{ steps.validate_inputs.outputs.release_tag }}

.github/workflows/release-31_promote-rc-to-final.yml

@@ -43,7 +43,7 @@ jobs:
 
   validate-inputs:
     needs: [ check-synchronization ]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
       release_tag: ${{ steps.validate_inputs.outputs.release_tag }}

.github/workflows/release-40_publish-deb-package.yml

@@ -29,7 +29,13 @@ on:
         type: string
 
 jobs:
+  check-synchronization:
+    uses: paritytech-release/sync-workflows/.github/workflows/check-synchronization.yml@main
+    secrets:
+      fork_writer_app_key: ${{ secrets.UPSTREAM_CONTENT_SYNC_APP_KEY }}
   call-publish-workflow:
+    needs: [check-synchronization]
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     uses: ./.github/workflows/release-reusable-publish-packages.yml
     with:
       tag: ${{ inputs.tag }}

.github/workflows/release-41_publish-rpm-package.yml

@@ -28,7 +28,13 @@ on:
         type: string
 
 jobs:
+  check-synchronization:
+    uses: paritytech-release/sync-workflows/.github/workflows/check-synchronization.yml@main
+    secrets:
+      fork_writer_app_key: ${{ secrets.UPSTREAM_CONTENT_SYNC_APP_KEY }}
   call-publish-workflow:
+    needs: [check-synchronization]
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     uses: ./.github/workflows/release-reusable-publish-packages.yml
     with:
       tag: ${{ inputs.tag }}

.github/workflows/release-50_publish-docker.yml

@@ -107,7 +107,7 @@ jobs:
 
   validate-inputs:
     needs: [check-synchronization]
-    if: ${{ needs.check-synchronization.outputs.checks_passed }} == 'true'
+    if: needs.check-synchronization.outputs.checks_passed == 'true'
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.validate_inputs.outputs.VERSION }}

.github/workflows/release-60_post-crates-release-activities.yml

@@ -1,9 +1,26 @@
 name: Release - Post Crates Release Activities
 
 on:
-  push:
-    branches:
-      - 'post-crates-release-*'
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Full release version identifier (e.g., stable2512 or stable2512-2)'
+        required: true
+        type: string
+      bump_node_version:
+        description: 'Bump NODE_VERSION? Select "yes" if this is the first run for this post-crates PR, "no" if re-running or if you have another reason not to bump'
+        required: true
+        type: choice
+        options:
+          - 'yes'
+          - 'no'
+      bump_spec_version:
+        description: 'Bump spec_version? Select "yes" to bump spec version for all runtimes, "no" if re-running or if you have another reason not to bump'
+        required: true
+        type: choice
+        options:
+          - 'yes'
+          - 'no'
 
 permissions:
   contents: write
@@ -68,6 +85,7 @@ jobs:
           git config --global user.signingKey "D8018FBB3F534D866A45998293C5FB5F6A367B51"
 
       - name: Bump NODE_VERSION for polkadot
+        if: inputs.bump_node_version == 'yes'
         run: |
           echo "Bumping NODE_VERSION in polkadot..."
           FILE="polkadot/node/primitives/src/lib.rs"
@@ -87,6 +105,7 @@ jobs:
           echo "Successfully bumped NODE_VERSION from $current_version to $new_version"
 
       - name: Bump NODE_VERSION for polkadot-parachain and polkadot-omni-node
+        if: inputs.bump_node_version == 'yes'
         run: |
           echo "Bumping NODE_VERSION in cumulus..."
           FILE="cumulus/polkadot-omni-node/lib/src/nodes/mod.rs"
@@ -106,6 +125,7 @@ jobs:
           echo "Successfully bumped NODE_VERSION from $current_version to $new_version"
 
       - name: Commit NODE_VERSION bumps
+        if: inputs.bump_node_version == 'yes'
         shell: bash
         run: |
           . ./.github/scripts/release/release_lib.sh
@@ -118,51 +138,72 @@ jobs:
           commit_with_message "Bump NODE_VERSION to $NODE_VERSION"
           echo "✅ Successfully committed NODE_VERSION bump"
 
-      - name: Move prdocs to release folder
+      - name: Bump spec_version
+        if: inputs.bump_spec_version == 'yes'
         shell: bash
         run: |
           . ./.github/scripts/release/release_lib.sh
 
-          # Extract release name from branch name (everything after "post-crates-release-")
-          BRANCH_NAME="${{ github.ref_name }}"
-          echo "Branch name: $BRANCH_NAME"
-
-          if [[ "$BRANCH_NAME" =~ post-crates-release-(.+)$ ]]; then
-            RELEASE_FOLDER="${BASH_REMATCH[1]}"
-            echo "Release folder name: $RELEASE_FOLDER"
+          FILE="polkadot/node/primitives/src/lib.rs"
+          NODE_VERSION=$(grep 'pub const NODE_VERSION' "$FILE" | grep -oE '"[0-9]+\.[0-9]+\.[0-9]+"' | tr -d '"')
 
-            # Use the reorder_prdocs helper function
-            reorder_prdocs "$RELEASE_FOLDER"
+          # Determine if this is a patch release or new stable release
+          patch=$(echo "$NODE_VERSION" | awk -F'[.-]' '{print $3}')
+          if [ "$patch" -gt 0 ]; then
+            IS_PATCH_RELEASE="true"
+            printf "📋 Patch release detected (patch=$patch) - bumping spec_version patch part\n"
           else
-            echo "WARNING: Could not extract release name from branch name: $BRANCH_NAME"
-            echo "Expected format: post-crates-release-<release-name>"
-            exit 1
+            IS_PATCH_RELEASE="false"
+            printf "📋 New stable release detected - bumping spec_version minor part\n"
           fi
 
+          runtimes_list=$(get_filtered_runtimes_list)
+
+          for f in ${runtimes_list[@]}; do
+              new_version=$(bump_spec_version "$f" "$IS_PATCH_RELEASE")
+              printf " 🔄  $f → spec_version: $new_version\n"
+          done
+
+          commit_with_message "Bump spec_version for $([ \"$IS_PATCH_RELEASE\" = \"true\" ] && echo \"patch\" || echo \"stable\") release"
+
+      - name: Move prdocs to release folder
+        shell: bash
+        run: |
+          . ./.github/scripts/release/release_lib.sh
+
+          VERSION="${{ inputs.version }}"
+          echo "Version: $VERSION"
+
+          reorder_prdocs "$VERSION"
+
       - name: Replace path dependencies
         run: |
           echo "Running replace-all-path-deps.sh..."
           bash scripts/release/replace-all-path-deps.sh
-          
+
           # Show git diff to see what changed
           git diff --stat
 
       - name: Remove versions where path deps are present
         run: |
           echo "Running delete-versions-if-path-is-present.sh..."
           bash scripts/release/delete-versions-if-path-is-present.sh
-          
+
           # Show git diff to see what changed
           git diff --stat
 
       - name: Remove version from umbrella/Cargo.toml
         run: |
           echo "Running delete-version-from-umbrella.sh..."
           bash scripts/release/delete-version-from-umbrella.sh
-          
+
           # Show git diff to see what changed
           git diff --stat
 
+      - name: Install newer Zepter
+        run: |
+          cargo install [email protected] --locked -q && zepter --version
+
       - name: Run Zepter - check issues
         run: |
           echo "Running zepter run check to identify issues..."
@@ -248,32 +289,36 @@ jobs:
         shell: bash
         run: |
           BRANCH_NAME="${{ github.ref_name }}"
+          FULL_RELEASE="${{ inputs.version }}"
           echo "Current branch: $BRANCH_NAME"
+          echo "Version: $FULL_RELEASE"
 
-          # Extract base release branch name
-          if [[ "$BRANCH_NAME" =~ ^post-crates-release-(.+)$ ]]; then
-            FULL_RELEASE="${BASH_REMATCH[1]}"
+          # Extract base release branch name by removing the last segment after dash
+          if [[ "$FULL_RELEASE" =~ ^(.+)-[^-]+$ ]]; then
+            BASE_RELEASE="${BASH_REMATCH[1]}"
+          else
+            BASE_RELEASE="$FULL_RELEASE"
+          fi
 
-            if [[ "$FULL_RELEASE" =~ ^(.+)-[^-]+$ ]]; then
-              BASE_RELEASE="${BASH_REMATCH[1]}"
-            else
-              BASE_RELEASE="$FULL_RELEASE"
-            fi
+          # Check if PR already exists
+          EXISTING_PR=$(gh pr list --head "$BRANCH_NAME" --base "$BASE_RELEASE" --json number --jq '.[0].number')
 
+          if [ -n "$EXISTING_PR" ]; then
+            echo "✅ PR #$EXISTING_PR already exists for this branch"
+            echo "PR URL: $(gh pr view $EXISTING_PR --json url --jq '.url')"
+          else
             echo "Creating PR from $BRANCH_NAME to $BASE_RELEASE..."
             gh pr create \
-              --title "Post crates release activities for $BASE_RELEASE" \
+              --title "[${BASE_RELEASE}] Post crates release activities for $FULL_RELEASE" \
               --body "Automated PR containing post-crates-release activities:
-            - NODE_VERSION bumps
-            - Path dependencies replacement
-            - Zepter fixes
-            - Taplo formatting
-            - PRDocs reorganization" \
+          - NODE_VERSION bumps (if selected)
+          - Path dependencies replacement
+          - Zepter fixes
+          - Taplo formatting
+          - PRDocs reorganization (if prdocs exist)" \
               --base "$BASE_RELEASE" \
-              --head "$BRANCH_NAME" || echo "PR may already exist or there was an error creating it"
-          else
-            echo "ERROR: Could not extract base release branch from: $BRANCH_NAME, probably wrong format"
-            exit 1
+              --head "$BRANCH_NAME"
+            echo "✅ PR created successfully"
           fi
 
       - name: Add comment about spec_version