diff --git a/.github/ISSUE_TEMPLATE/release-runtime.md b/.github/ISSUE_TEMPLATE/release-runtime.md index a9430c6103b..0f3543759af 100644 --- a/.github/ISSUE_TEMPLATE/release-runtime.md +++ b/.github/ISSUE_TEMPLATE/release-runtime.md @@ -33,8 +33,9 @@ The following checks can be performed after we have forked off to the release-ca runtime state is correctly updated for any public (non-private/test) networks - [ ] Run [integration tests](https://github.com/paritytech/cumulus/blob/master/docs/release.md#integration-tests), and make sure they pass. -- [ ] Push runtime upgrade to Westmint and verify network stability +- [ ] Push runtime upgrade to Asset Hub Westend and verify network stability - [ ] Push runtime upgrade to Collectives and verify network stability +- [ ] Push runtime upgrade to Bridge-Hub-Kusama and verify network stability ### Github diff --git a/scripts/ci/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog index a02c4cde6b0..6fe7fcec528 100755 --- a/scripts/ci/changelog/bin/changelog +++ b/scripts/ci/changelog/bin/changelog @@ -84,9 +84,9 @@ end POLKADOT_COLLECTIVES_DIGEST = ENV['COLLECTIVES_POLKADOT_DIGEST'] || 'digests/collectives-polkadot-srtool-digest.json' SHELL_DIGEST = ENV['SHELL_DIGEST'] || 'digests/shell-srtool-digest.json' -ASSET_HUB_WESTEND_DIGEST = ENV['ASSET_HUB_WESTEND_DIGEST'] || 'digests/westmint-srtool-digest.json' -ASSET_HUB_KUSAMA_DIGEST = ENV['ASSET_HUB_KUSAMA_DIGEST'] || 'digests/statemine-srtool-digest.json' -ASSET_HUB_POLKADOT_DIGEST = ENV['ASSET_HUB_POLKADOT_DIGEST'] || 'digests/statemint-srtool-digest.json' +ASSET_HUB_WESTEND_DIGEST = ENV['ASSET_HUB_WESTEND_DIGEST'] || 'digests/asset-hub-westend-srtool-digest.json' +ASSET_HUB_KUSAMA_DIGEST = ENV['ASSET_HUB_KUSAMA_DIGEST'] || 'digests/asset-hub-kusama-srtool-digest.json' +ASSET_HUB_POLKADOT_DIGEST = ENV['ASSET_HUB_POLKADOT_DIGEST'] || 'digests/asset-hub-westend-srtool-digest.json' BRIDGE_HUB_ROCOCO_DIGEST = ENV['BRIDGE_HUB_ROCOCO_DIGEST'] || 'digests/bridge-hub-rococo-srtool-digest.json' BRIDGE_HUB_KUSAMA_DIGEST = ENV['BRIDGE_HUB_KUSAMA_DIGEST'] || 'digests/bridge-hub-kusama-srtool-digest.json' BRIDGE_HUB_POLKADOT_DIGEST = ENV['BRIDGE_HUB_POLKADOT_DIGEST'] || 'digests/bridge-hub-polkadot-srtool-digest.json' @@ -131,16 +131,16 @@ else substrate: $substrate[0], polkadot: $polkadot[0], srtool: [ - { name: "shell", data: $srtool_shell[0] }, - { name: "westmint", data: $srtool_westmint[0] }, - { name: "statemine", data: $srtool_statemine[0] }, - { name: "statemint", data: $srtool_statemint[0] }, - { name: "rococo", data: $srtool_rococo_parachain[0] }, - { name: "contracts", data: $srtool_contracts_rococo[0] }, - { name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] }, - { name: "bridge-hub-rococo", data: $srtool_bridge_hub_rococo[0] }, - { name: "bridge-hub-kusama", data: $srtool_bridge_hub_kusama[0] }, - { name: "bridge-hub-polkadot", data: $srtool_bridge_hub_polkadot[0] } + { order: 10, name: "asset-hub-polkadot", note: " (Former Statemint)", data: $srtool_statemint[0] }, + { order: 11, name: "bridge-hub-polkadot", data: $srtool_bridge_hub_polkadot[0] }, + { order: 20, name: "asset-hub-kusama", note: " (Former Statemine)", data: $srtool_statemine[0] }, + { order: 21, name: "bridge-hub-kusama", data: $srtool_bridge_hub_kusama[0] }, + { order: 30, name: "asset-hub-westend", note: " (Former Westmint)", data: $srtool_westmint[0] }, + { order: 40, name: "rococo", data: $srtool_rococo_parachain[0] }, + { order: 41, name: "bridge-hub-rococo", data: $srtool_bridge_hub_rococo[0] }, + { order: 50, name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] }, + { order: 60, name: "contracts", data: $srtool_contracts_rococo[0] }, + { order: 90, name: "shell", data: $srtool_shell[0] } ] }\' > context.json', cumulus_data, substrate_data, diff --git a/scripts/ci/changelog/templates/runtime.md.tera b/scripts/ci/changelog/templates/runtime.md.tera index 9e7e04b5c63..d2070245838 100644 --- a/scripts/ci/changelog/templates/runtime.md.tera +++ b/scripts/ci/changelog/templates/runtime.md.tera @@ -1,7 +1,7 @@ {# This macro shows one runtime #} {%- macro runtime(runtime) -%} -### {{ runtime.name | capitalize }} +### {{ runtime.name | replace(from="-", to=" ") | title }} {%- if runtime.note -%} {{ runtime.note }} {%- endif -%} {%- if runtime.data.runtimes.compressed.subwasm.compression.compressed %} {%- set compressed = "Yes" %} diff --git a/scripts/ci/changelog/templates/runtimes.md.tera b/scripts/ci/changelog/templates/runtimes.md.tera index 600c5f17dc9..fe2e16aa9c2 100644 --- a/scripts/ci/changelog/templates/runtimes.md.tera +++ b/scripts/ci/changelog/templates/runtimes.md.tera @@ -8,7 +8,7 @@ The information about the runtimes included in this release can be found below. The runtimes have been built using [{{ rtm.data.gen }}](https://github.com/paritytech/srtool) and `{{ rtm.data.rustc }}`. -{%- for runtime in srtool | sort(attribute="name") %} +{%- for runtime in srtool | sort(attribute="order") %} {%- set HIDE_VAR = "HIDE_SRTOOL_" ~ runtime.name | upper %} {%- if not env is containing(HIDE_VAR) %}