From 103e68a7660b9cf175c11afbbe4afb250db7fb2a Mon Sep 17 00:00:00 2001 From: Egor_P Date: Mon, 6 Apr 2026 18:37:38 +0200 Subject: [PATCH 1/3] BACKPORT-CONFLICT --- ...ease-60_post-crates-release-activities.yml | 3 +++ .../workflows/release-80_publish-crates.yml | 27 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/.github/workflows/release-60_post-crates-release-activities.yml b/.github/workflows/release-60_post-crates-release-activities.yml index 8a41ca4d00b2f..7914027a3f914 100644 --- a/.github/workflows/release-60_post-crates-release-activities.yml +++ b/.github/workflows/release-60_post-crates-release-activities.yml @@ -178,6 +178,7 @@ jobs: reorder_prdocs "$VERSION" +<<<<<<< HEAD - name: Replace path dependencies run: | echo "Running replace-all-path-deps.sh..." @@ -253,6 +254,8 @@ jobs: echo "Checking for git dependencies..." python3 .github/scripts/deny-git-deps.py . +======= +>>>>>>> 387a7e21 ([Release|CI/CD] Add `parity-publish restore` step to simplify post crates release activity (#11652)) - name: Check git status before commit run: | echo "=== Git status ===" diff --git a/.github/workflows/release-80_publish-crates.yml b/.github/workflows/release-80_publish-crates.yml index d4815c4d01010..0cce16368e312 100644 --- a/.github/workflows/release-80_publish-crates.yml +++ b/.github/workflows/release-80_publish-crates.yml @@ -167,6 +167,7 @@ jobs: fi echo "On branch $CRATES_RELEASE_BRANCH" +<<<<<<< HEAD - name: Install Rust 1.93 shell: bash run: | @@ -185,6 +186,12 @@ jobs: run: | sudo apt-get update && sudo apt-get install -y --no-install-recommends libcurl4-openssl-dev pkg-config cargo install parity-publish@0.10.12 --locked -q +======= + - name: Install parity-publish + run: | + sudo apt-get update && sudo apt-get install -y --no-install-recommends libcurl4-openssl-dev pkg-config + cargo install parity-publish@0.10.14 --locked -q +>>>>>>> 387a7e21 ([Release|CI/CD] Add `parity-publish restore` step to simplify post crates release activity (#11652)) - name: Run parity-publish plan if: inputs.resume_from == 'full' @@ -326,6 +333,26 @@ jobs: echo "Crates published successfully to $REGISTRY!" fi + - name: Restore clean manifests after publish + if: inputs.resume_from != 'push' + shell: bash + env: + RELEASE_NAME: ${{ inputs.release_name }} + run: | + . ./.github/scripts/release/release_lib.sh + + echo "Restoring clean manifests with version bumps only..." + parity-publish restore + + git add -A + if [[ -n $(git status --porcelain) ]]; then + commit_with_message "Restore clean manifests after crates publish for $RELEASE_NAME" + echo "Clean manifests committed" + else + echo "No changes to restore" + fi + + - name: Generate token for paritytech/polkadot-sdk id: generate_write_token uses: actions/create-github-app-token@29824e69f54612133e76f7eaac726eef6c875baf # v2.2.1 From f1d4bd4b846a96c850203129cf00c60dfa63ca23 Mon Sep 17 00:00:00 2001 From: Egor_P Date: Wed, 8 Apr 2026 10:29:59 +0200 Subject: [PATCH 2/3] Resolve conflicts Removed several steps related to path dependencies and Zepter checks from the release workflow. --- ...ease-60_post-crates-release-activities.yml | 78 ------------------- 1 file changed, 78 deletions(-) diff --git a/.github/workflows/release-60_post-crates-release-activities.yml b/.github/workflows/release-60_post-crates-release-activities.yml index 7914027a3f914..0b11007c39ac4 100644 --- a/.github/workflows/release-60_post-crates-release-activities.yml +++ b/.github/workflows/release-60_post-crates-release-activities.yml @@ -178,84 +178,6 @@ jobs: reorder_prdocs "$VERSION" -<<<<<<< HEAD - - 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: Run Zepter - check issues - run: | - echo "Running zepter run check to identify issues..." - zepter run check || echo "Zepter found issues that need to be fixed" - - - name: Run Zepter - fix issues - run: | - echo "Running zepter to fix issues..." - zepter || echo "Zepter fix completed" - # Show git diff to see what changed - git diff --stat - - - name: Run Zepter - verify fixes - run: | - echo "Running zepter run check again to verify fixes..." - zepter run check || echo "There are still issues to fix manually" - - - name: Run taplo - check formatting - run: | - echo "Running taplo format check..." - taplo format --check --config .config/taplo.toml || echo "Taplo found formatting issues" - - - name: Run taplo - format - run: | - echo "Running taplo format..." - taplo format --config .config/taplo.toml - # Show git diff to see what changed - git diff --stat - - - name: Run taplo - verify formatting - run: | - echo "Running taplo format check again..." - taplo format --check --config .config/taplo.toml || echo "There are still formatting issues" - - - name: Install Python dependencies - run: | - echo "Installing Python dependencies..." - pip3 install toml "cargo-workspace>=1.2.6" - - - name: Run workspace check - run: | - echo "Running workspace check..." - python3 .github/scripts/check-workspace.py . --exclude \ - "substrate/frame/contracts/fixtures/build" \ - "substrate/frame/contracts/fixtures/contracts/common" - - - name: Deny git dependencies - run: | - echo "Checking for git dependencies..." - python3 .github/scripts/deny-git-deps.py . - -======= ->>>>>>> 387a7e21 ([Release|CI/CD] Add `parity-publish restore` step to simplify post crates release activity (#11652)) - name: Check git status before commit run: | echo "=== Git status ===" From 833db8ec61b1b759148b75ad62ff372e5aab74f4 Mon Sep 17 00:00:00 2001 From: Egor_P Date: Wed, 8 Apr 2026 10:30:56 +0200 Subject: [PATCH 3/3] Resolve conflicts --- .github/workflows/release-80_publish-crates.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release-80_publish-crates.yml b/.github/workflows/release-80_publish-crates.yml index 0cce16368e312..706c36b69ba16 100644 --- a/.github/workflows/release-80_publish-crates.yml +++ b/.github/workflows/release-80_publish-crates.yml @@ -167,7 +167,6 @@ jobs: fi echo "On branch $CRATES_RELEASE_BRANCH" -<<<<<<< HEAD - name: Install Rust 1.93 shell: bash run: | @@ -182,16 +181,10 @@ jobs: with: cache-on-failure: true - - name: Install parity-publish - run: | - sudo apt-get update && sudo apt-get install -y --no-install-recommends libcurl4-openssl-dev pkg-config - cargo install parity-publish@0.10.12 --locked -q -======= - name: Install parity-publish run: | sudo apt-get update && sudo apt-get install -y --no-install-recommends libcurl4-openssl-dev pkg-config cargo install parity-publish@0.10.14 --locked -q ->>>>>>> 387a7e21 ([Release|CI/CD] Add `parity-publish restore` step to simplify post crates release activity (#11652)) - name: Run parity-publish plan if: inputs.resume_from == 'full'