[stable2412] Backport #7367 (#7500)

Backport #7367 into `stable2412` from iulianbarbu.

See the
[documentation](https://github.com/paritytech/polkadot-sdk/blob/master/docs/BACKPORT.md)
on how to use this bot.

<!--
  # To be used by other automation, do not modify:
  original-pr-number: #${pull_number}
-->

---------

Signed-off-by: Iulian Barbu <iulian.barbu@parity.io>
Co-authored-by: Iulian Barbu <14218860+iulianbarbu@users.noreply.github.com>
Co-authored-by: Iulian Barbu <iulian.barbu@parity.io>

.github/workflows/release-10_branchoff-stable.yml

@@ -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)

cumulus/polkadot-omni-node/lib/src/lib.rs

@@ -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;

cumulus/polkadot-omni-node/lib/src/nodes/mod.rs

@@ -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

cumulus/polkadot-omni-node/src/main.rs

@@ -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 {

cumulus/polkadot-parachain/src/main.rs

@@ -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 {

prdoc/pr_7367.prdoc

+title: Align omni-node and polkadot-parachain versions 
+doc:
+- audience: [ Runtime Dev, Node Dev, Node Operator ]
+  description: |-
+    Aligned polkadot-omni-node & polkadot-parachain versions. There is one NODE_VERSION constant, in polkadot-omni-node-lib, used by both binaries.
+crates:
+- name: polkadot-omni-node-lib 
+  bump: patch