Browse Source

Merge pull request #1401 from mnaamani/runtime/bump-version

runtime: bump version and build chainspec builder in docker image
shamil-gadelshin 4 years ago
parent
commit
d2ba00deb7

+ 2 - 2
Cargo.lock

@@ -1993,7 +1993,7 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "joystream-node"
 name = "joystream-node"
-version = "3.1.0"
+version = "3.2.0"
 dependencies = [
 dependencies = [
  "frame-benchmarking",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "frame-benchmarking-cli",
@@ -2053,7 +2053,7 @@ dependencies = [
 
 
 [[package]]
 [[package]]
 name = "joystream-node-runtime"
 name = "joystream-node-runtime"
-version = "7.3.0"
+version = "7.4.0"
 dependencies = [
 dependencies = [
  "frame-benchmarking",
  "frame-benchmarking",
  "frame-executive",
  "frame-executive",

+ 3 - 2
devops/dockerfiles/node-and-runtime/Dockerfile

@@ -3,14 +3,15 @@ LABEL description="Compiles all workspace artifacts"
 WORKDIR /joystream
 WORKDIR /joystream
 COPY . /joystream
 COPY . /joystream
 
 
-# Build joystream-node and its dependencies - runtime
-RUN WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo build --release -p joystream-node
+# Build all cargo crates
+RUN WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo build --release
 
 
 FROM debian:stretch
 FROM debian:stretch
 LABEL description="Joystream node"
 LABEL description="Joystream node"
 WORKDIR /joystream
 WORKDIR /joystream
 COPY --from=builder /joystream/target/release/joystream-node /joystream/node
 COPY --from=builder /joystream/target/release/joystream-node /joystream/node
 COPY --from=builder /joystream/target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm /joystream/runtime.compact.wasm
 COPY --from=builder /joystream/target/release/wbuild/joystream-node-runtime/joystream_node_runtime.compact.wasm /joystream/runtime.compact.wasm
+COPY --from=builder /joystream/target/release/chain-spec-builder /joystream/chain-spec-builder
 
 
 # confirm it works
 # confirm it works
 RUN /joystream/node --version
 RUN /joystream/node --version

+ 1 - 1
node/Cargo.toml

@@ -3,7 +3,7 @@ authors = ['Joystream contributors']
 build = 'build.rs'
 build = 'build.rs'
 edition = '2018'
 edition = '2018'
 name = 'joystream-node'
 name = 'joystream-node'
-version = '3.1.0'
+version = '3.2.0'
 default-run = "joystream-node"
 default-run = "joystream-node"
 
 
 [[bin]]
 [[bin]]

+ 5 - 2
runtime/CHANGELOG.md

@@ -1,11 +1,14 @@
-### Version 6.21.0 - Constantinople runtime upgrade B (Nicaea) - July 29 2020
+### Version 7.4.0 - Alexandria - new chain - September 21 2020
+- Update to substrate v2.0.0-rc4
+
+### Version 6.21.0 - (Constantinople) runtime upgrade B (Nicaea) - July 29 2020
 
 
 - Introduction of general Working Group runtime module
 - Introduction of general Working Group runtime module
 - Adds a new instance of the working group module - the Storage Working Group which
 - Adds a new instance of the working group module - the Storage Working Group which
   replaces the old actors module for managing the Storge Provider enrollment process
   replaces the old actors module for managing the Storge Provider enrollment process
 - New governance proposals to support new working groups
 - New governance proposals to support new working groups
 
 
-### Version 6.15.0 - Constantinople runtime upgrade A - June 2020
+### Version 6.15.0 - (Constantinople) runtime upgrade A - June 2020
 
 
 - Updated runtime to sort out type name clashes between the proposal discussion module
 - Updated runtime to sort out type name clashes between the proposal discussion module
   and forum module, in preparing to roll out proposal discussion system in pioneer.
   and forum module, in preparing to roll out proposal discussion system in pioneer.

+ 1 - 1
runtime/Cargo.toml

@@ -4,7 +4,7 @@ edition = '2018'
 name = 'joystream-node-runtime'
 name = 'joystream-node-runtime'
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # Follow convention: https://github.com/Joystream/substrate-runtime-joystream/issues/1
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
 # {Authoring}.{Spec}.{Impl} of the RuntimeVersion
-version = '7.3.0'
+version = '7.4.0'
 
 
 [dependencies]
 [dependencies]
 # Third-party dependencies
 # Third-party dependencies

+ 1 - 1
runtime/src/lib.rs

@@ -70,7 +70,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("joystream-node"),
     spec_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     impl_name: create_runtime_str!("joystream-node"),
     authoring_version: 7,
     authoring_version: 7,
-    spec_version: 3,
+    spec_version: 4,
     impl_version: 0,
     impl_version: 0,
     apis: crate::runtime_api::EXPORTED_RUNTIME_API_VERSIONS,
     apis: crate::runtime_api::EXPORTED_RUNTIME_API_VERSIONS,
     transaction_version: 1,
     transaction_version: 1,