Skip to content
Snippets Groups Projects
Unverified Commit 3fb7c8c6 authored by Iulian Barbu's avatar Iulian Barbu Committed by GitHub
Browse files

Align omni-node and polkadot-parachain versions (#7367)


# Description

Aligned `polkadot-omni-node` & `polkadot-parachain` versions. There is
one `NODE_VERSION` constant, in `polkadot-omni-node-lib`, used by both
binaries.

Closes #7276 .

## Integration

Node operators will know what versions of `polkadot-omni-node` &
`polkadot-parachain` they use since their versions will be kept in sync
with the stable release `polkadot` SemVer version.

## Review Notes

TODO:
- [x] update NODE_VERSION of `polkadot-omni-node-lib` when running
branch off workflow

---------

Signed-off-by: default avatarIulian Barbu <iulian.barbu@parity.io>
parent 274a781e
Branches
No related merge requests found
Pipeline #514190 waiting for manual action with stages
in 9 minutes and 10 seconds
......@@ -92,8 +92,11 @@ jobs:
. ./.github/scripts/release/release_lib.sh
NODE_VERSION="${{ needs.prepare-tooling.outputs.node_version }}"
set_version "\(NODE_VERSION[^=]*= \)\".*\"" $NODE_VERSION "polkadot/node/primitives/src/lib.rs"
NODE_VERSION_PATTERN="\(NODE_VERSION[^=]*= \)\".*\""
set_version $NODE_VERSION_PATTERN $NODE_VERSION "polkadot/node/primitives/src/lib.rs"
commit_with_message "Bump node version to $NODE_VERSION in polkadot-cli"
set_version $NODE_VERSION_PATTERN $NODE_VERSION "cumulus/polkadot-omni-node/lib/src/nodes/mod.rs"
commit_with_message "Bump node version to $NODE_VERSION in polkadot-omni-node-lib"
SPEC_VERSION=$(get_spec_version $NODE_VERSION)
runtimes_list=$(get_filtered_runtimes_list)
......
......@@ -26,3 +26,4 @@ mod nodes;
pub use cli::CliConfig;
pub use command::{run, RunConfig};
pub use common::{chain_spec, runtime};
pub use nodes::NODE_VERSION;
......@@ -22,6 +22,11 @@ use cumulus_primitives_core::ParaId;
use manual_seal::ManualSealNode;
use sc_service::{Configuration, TaskManager};
/// The current node version for cumulus official binaries, which takes the basic
/// SemVer form `<major>.<minor>.<patch>`. It should correspond to the latest
/// `polkadot` version of a stable release.
pub const NODE_VERSION: &'static str = "1.17.1";
/// Trait that extends the `DynNodeSpec` trait with manual seal related logic.
///
/// We need it in order to be able to access both the `DynNodeSpec` and the manual seal logic
......
......@@ -23,14 +23,15 @@
use polkadot_omni_node_lib::{
chain_spec::DiskChainSpecLoader, run, runtime::DefaultRuntimeResolver, CliConfig as CliConfigT,
RunConfig,
RunConfig, NODE_VERSION,
};
struct CliConfig;
impl CliConfigT for CliConfig {
fn impl_version() -> String {
env!("SUBSTRATE_CLI_IMPL_VERSION").into()
let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
format!("{}-{commit_hash}", NODE_VERSION)
}
fn author() -> String {
......
......@@ -21,13 +21,14 @@
mod chain_spec;
use polkadot_omni_node_lib::{run, CliConfig as CliConfigT, RunConfig};
use polkadot_omni_node_lib::{run, CliConfig as CliConfigT, RunConfig, NODE_VERSION};
struct CliConfig;
impl CliConfigT for CliConfig {
fn impl_version() -> String {
env!("SUBSTRATE_CLI_IMPL_VERSION").into()
let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
format!("{}-{commit_hash}", NODE_VERSION)
}
fn author() -> String {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment