Skip to content

Commit

Permalink
chore: bump to version 2.6.0-rc1 (specVersion: 146) (#872)
Browse files Browse the repository at this point in the history
  • Loading branch information
renauter authored Oct 4, 2023
1 parent 32195fa commit a920b0f
Show file tree
Hide file tree
Showing 11 changed files with 63 additions and 64 deletions.
4 changes: 2 additions & 2 deletions activation-service/helm/tfchainactivationservice/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: tfchainactivationservice
description: TFchain account activation funding service
type: application
version: 2.5.0-rc7
appVersion: "2.5.0-rc7"
version: 2.6.0-rc1
appVersion: '2.6.0-rc1'
4 changes: 2 additions & 2 deletions activation-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "substrate-funding-service",
"version": "2.5.0-rc7",
"version": "2.6.0-rc1",
"description": "Substrate funding service",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -36,4 +36,4 @@
"pino-pretty": "^5.0.2",
"standard": "^16.0.3"
}
}
}
7 changes: 2 additions & 5 deletions bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
apiVersion: v2
name: tfchainbridge
description: Bridge for TFT between Tfchain Stellar

type: application

version: 2.5.0-rc7

appVersion: '2.5.0-rc7'
version: 2.6.0-rc1
appVersion: '2.6.0-rc1'
4 changes: 2 additions & 2 deletions clients/tfchain-client-js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tfgrid-api-client",
"version": "2.5.0-rc7",
"version": "2.6.0-rc1",
"description": "API client for the TF Grid",
"main": "index.js",
"scripts": {
Expand All @@ -17,4 +17,4 @@
"devDependencies": {
"standard": "^16.0.3"
}
}
}
56 changes: 32 additions & 24 deletions docs/production/releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,37 @@

Releases are automated by [this workflow](.github/workflows/030_create_release.yaml). When a release should be created following things need to be done:

- substrate-node
- Increment spec version in the runtime [lib.rs](../../substrate-node/runtime/src/lib.rs)
- Increment version in [Cargo.toml](../../substrate-node/Cargo.toml)
- Increment package `version` filed in [Chart.yaml](../../substrate-node/charts/substrate-node/Chart.yaml)
- tfchainbridge
- Increment chart `appVersion` filed in [Chart.yaml](../../bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml)
- Increment chart ` version` filed in [Chart.yaml](../../bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml)
- activation-service
- Increment chart `appVersion` filed in [Chart.yaml](../../activation-service/helm/tfchainactivationservice/Chart.yaml)
- Increment chart `version` filed in [Chart.yaml](../../activation-service/helm/tfchainactivationservice/Chart.yaml)
- Increment package `version` in [package.json](../../activation-service/package.json)
- Js TFChain Client
- Increment package `version` in [package.json](../../clients/tfchain-client-js/package.json)
- Scripts
- Increment package `version` in [package.json](../../scripts/package.json)
- Tools/fork-off-substrate
- Increment package `version` in [package.json](../../tools/fork-off-substrate/package.json)

- Commit the changes
- Create a new tag with the version number prefixed with a `v` (e.g. `v1.0.0`, `v1.0.0-rc1` for release candidates)
- Push the tag to the repository
- The workflow will create a release draft with the changelog and the binaries attached
* substrate-node
* Increment spec version in the runtime [lib.rs](../../substrate-node/runtime/src/lib.rs)
* Increment version in [Cargo.toml](../../substrate-node/Cargo.toml)
* Increment chart `version` filed in [Chart.yaml](../../substrate-node/charts/substrate-node/Chart.yaml)
* Increment chart `appVersion` filed in [Chart.yaml](../../substrate-node/charts/substrate-node/Chart.yaml)

* tfchainbridge
* Increment chart `version` filed in [Chart.yaml](../../bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml)
* Increment chart `appVersion` filed in [Chart.yaml](../../bridge/tfchain_bridge/chart/tfchainbridge/Chart.yaml)

* activation-service
* Increment chart `version` filed in [Chart.yaml](../../activation-service/helm/tfchainactivationservice/Chart.yaml)
* Increment chart `appVersion` filed in [Chart.yaml](../../activation-service/helm/tfchainactivationservice/Chart.yaml)
* Increment package `version` in [package.json](../../activation-service/package.json)

* Js TFChain Client
* Increment package `version` in [package.json](../../clients/tfchain-client-js/package.json)

* Scripts
* Increment package `version` in [package.json](../../scripts/package.json)

* Tools/fork-off-substrate
* Increment package `version` in [package.json](../../tools/fork-off-substrate/package.json)

* Commit the changes

* Create a new tag with the version number prefixed with a `v` (e.g. `v1.0.0`, `v1.0.0-rc1` for release candidates)

* Push the tag to the repository

* The workflow will create a release draft with the changelog and the binaries attached

A changelog will be generated based on the Pull requests merged, so having PRs with meaningful titles is important.

Expand All @@ -33,6 +42,5 @@ See [validate](../misc/validating_runtime.md) for instructions on how to validat

### Upgrade runtime

To upgrade the runtime for a network based on a release, download the runtime attached to the release (tfchain_runtime.compact.compressed.wasm)
To upgrade the runtime for a network based on a release, download the runtime attached to the release (tfchain\_runtime.compact.compressed.wasm)
and upload it to the network using a council proposal. The proposal should be a `set_code` proposal with the runtime as the code and majority of the council should vote in favor of the proposal.

6 changes: 3 additions & 3 deletions scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "tfchain-js-scripts",
"version": "2.5.0-rc7",
"version": "2.6.0-rc1",
"description": "scripts to fetch data / write data to tfchain",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"dependencies": {
"@polkadot/api": "^10.7.2",
"axios": "^0.25.0",
"bip39": "^3.0.3",
Expand All @@ -20,4 +20,4 @@
"devDependencies": {
"standard": "^16.0.3"
}
}
}
26 changes: 13 additions & 13 deletions substrate-node/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion substrate-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ homepage = "https://threefold.io/"
license-file = "LICENSE"
readme = "README.md"
repository = "https://github.com/threefoldtech/tfchain3"
version = "2.5.0-rc7"
version = "2.6.0-rc1"

[workspace]
members = [
Expand Down
4 changes: 2 additions & 2 deletions substrate-node/charts/substrate-node/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: substrate-node
description: Tfchain node
type: application
version: 2.5.0-rc7
appVersion: '2.5.0-rc7'
version: 2.6.0-rc1
appVersion: '2.6.0-rc1'
10 changes: 2 additions & 8 deletions substrate-node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("substrate-threefold"),
impl_name: create_runtime_str!("substrate-threefold"),
authoring_version: 1,
spec_version: 145,
spec_version: 146,
impl_version: 1,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
Expand Down Expand Up @@ -770,13 +770,7 @@ pub type Executive = frame_executive::Executive<

// All migrations executed on runtime upgrade as a nested tuple of types implementing
// `OnRuntimeUpgrade`.
type Migrations = (
// pallet_tfgrid::migrations::v16::KillNodeGpuStatus<Runtime>,
// pallet_smart_contract::migrations::v10::ReworkBillingLoopInsertion<Runtime>,
// pallet_smart_contract::migrations::v11::ExtendContractLock<Runtime>,
// migrations::remove_sudo::RemoveSudo<Runtime>,
pallet_tfgrid::migrations::v17::FixFarmPublicIps<Runtime>,
);
type Migrations = (pallet_tfgrid::migrations::v17::FixFarmPublicIps<Runtime>,);

// follows Substrate's non destructive way of eliminating otherwise required
// repetion: https://github.com/paritytech/substrate/pull/10592
Expand Down
4 changes: 2 additions & 2 deletions tools/fork-off-substrate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fork-off-substrate",
"version": "2.5.0-rc7",
"version": "2.6.0-rc1",
"description": "This script allows bootstrapping a new substrate chain with the current state of a live chain",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -29,4 +29,4 @@
"cli-progress": "^3.9.1",
"dotenv": "^10.0.0"
}
}
}

0 comments on commit a920b0f

Please sign in to comment.