Merge pull request #211 from digicatapult/feat/new-versioning

new versioning strategy
digicatapult · Nov 27, 2024 · caac142 · caac142
2 parents a87ccf5 + a7e213f
commit caac142
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,6 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
+version = "12.0.0"
 
 [workspace.dependencies]
 ##############################

diff --git a/Upgrade.md b/Upgrade.md
@@ -71,7 +71,7 @@ If tests pass, bump at least a minor version in the pallet `Cargo.toml` e.g. `pa
 
 Test that the upgraded dependencies work for the runtime, including the newly upgraded pallets `cargo build --release -p sqnc-runtime`. Fix any compilation errors.
 
-Bump the runtime version in `runtime/Cargo.toml`. Also increment the runtime `spec_version` in `runtime/src/lib.rs` to match. Note `spec_version` does not recognize semver, so treat it as a whole number. e.g. in place of `5.6.8` the `spec_version` would be `568`.
+Bump the version in top-level `Cargo.toml`. Also increment the runtime `spec_version` in `runtime/src/lib.rs` by one.
 
 Run the tests for the runtime:
 

diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -6,7 +6,7 @@ edition = '2021'
 license = 'Apache-2.0'
 repository = 'https://github.com/digicatapult/sqnc-node/'
 name = 'sqnc-node'
-version = '11.4.1'
+version = { workspace = true }
 
 [[bin]]
 name = 'sqnc-node'

diff --git a/pallets/doas/Cargo.toml b/pallets/doas/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-doas"
-version = "2.3.1"
+version = { workspace = true }
 authors = [
 	"Digital Catapult <https://www.digicatapult.org.uk>",
 	"Parity Technologies <[email protected]>",

diff --git a/pallets/process-validation/Cargo.toml b/pallets/process-validation/Cargo.toml
@@ -5,7 +5,7 @@ edition = '2021'
 license = 'Apache-2.0'
 repository = 'https://github.com/digicatapult/sqnc-node/'
 name = 'pallet-process-validation'
-version = "3.7.1"
+version = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/pallets/symmetric-key/Cargo.toml b/pallets/symmetric-key/Cargo.toml
@@ -5,7 +5,7 @@ edition = '2021'
 license = 'Apache-2.0'
 repository = 'https://github.com/digicatapult/sqnc-node/'
 name = 'pallet-symmetric-key'
-version = "2.3.1"
+version = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/pallets/traits/Cargo.toml b/pallets/traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqnc-pallet-traits"
-version = "3.5.1"
+version = { workspace = true }
 edition = "2021"
 authors = ['Digital Catapult <https://www.digicatapult.org.uk>']
 license = 'Apache-2.0'

diff --git a/pallets/transaction-payment-free/Cargo.toml b/pallets/transaction-payment-free/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-payment-free"
-version = "2.3.1"
+version = { workspace = true }
 authors = [
 	"Digital Catapult <https://www.digicatapult.org.uk>",
 	"Parity Technologies <[email protected]>",

diff --git a/pallets/utxo-nft/Cargo.toml b/pallets/utxo-nft/Cargo.toml
@@ -5,7 +5,7 @@ edition = '2021'
 license = 'Apache-2.0'
 repository = 'https://github.com/digicatapult/sqnc-node/'
 name = 'pallet-utxo-nft'
-version = "6.4.1"
+version = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sqnc-runtime"
-version = "11.3.1"
+version = { workspace = true }
 authors = ["Digital Catapult <https://www.digicatapult.org.uk>"]
 edition = "2021"
 license = "Apache-2.0"

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -87,7 +87,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("sqnc"),
     impl_name: create_runtime_str!("sqnc"),
     authoring_version: 1,
-    spec_version: 1131,
+    spec_version: 1132,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,

diff --git a/runtime/types/Cargo.toml b/runtime/types/Cargo.toml
@@ -5,7 +5,7 @@ edition = '2021'
 license = 'Apache-2.0'
 repository = 'https://github.com/digicatapult/sqnc-node/'
 name = 'sqnc-runtime-types'
-version = "1.1.1"
+version = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ['x86_64-unknown-linux-gnu']

diff --git a/scripts/check-version.sh b/scripts/check-version.sh
@@ -43,7 +43,7 @@ function assert_tomlq() {
 
 function get_working_copy_version() {
   assert_tomlq
-  CURRENT_VERSION=$(tomlq .package.version ./node/Cargo.toml | sed 's/"//g')
+  CURRENT_VERSION=$(tomlq .workspace.package.version ./Cargo.toml | sed 's/"//g')
 
   printf "This version found to be %s\n" "$CURRENT_VERSION"
 

diff --git a/tools/lang/Cargo.toml b/tools/lang/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "sqnc-lang"
 authors = ['Digital Catapult <https://www.digicatapult.org.uk>']
-version = "0.5.1"
+version = { workspace = true }
 edition = "2021"
 
 [lib]