Skip to content

Commit

Permalink
Merge staging to master (#319)
Browse files Browse the repository at this point in the history
### Description
<!-- Describe what change this PR is implementing -->

### Types of Changes
<!--- What types of changes does your code introduce? -->
- [ ] Tech Debt (Code improvements)
- [x] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Dependency upgrade (A change in substrate or any 3rd party crate
version)

### Migrations and Hooks
<!--- Check the following box with an x if the following applies: -->
- [ ] This change requires a runtime migration.
- [ ] Modifies `on_initialize`
- [ ] Modifies `on_finalize`

### Checklist
<!--- All boxes need to be checked. Follow this checklist before
requiring PR review -->
- [x] Change has been tested locally.
- [ ] Change adds / updates tests.
- [ ] Changelog doc updated.
  • Loading branch information
MRamanenkau authored Apr 30, 2024
1 parent 5b2dd2f commit 5b4e752
Show file tree
Hide file tree
Showing 25 changed files with 16,583 additions and 783 deletions.
59 changes: 31 additions & 28 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-05-23
toolchain: nightly-2024-03-12
override: true
components: rustfmt
- name: Check TOML
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-05-23
toolchain: nightly-2024-03-12
override: true
target: wasm32-unknown-unknown
- name: Rust Cache
Expand All @@ -55,35 +55,38 @@ jobs:
- name: Run dev chain
run: |
timeout --preserve-status 30s ./target/release/cere --dev
- name: Check Build for Benchmarking
run: >
pushd node &&
cargo check --features=runtime-benchmarks --release
# Disabled for one release to apply missing migrations
# https://github.com/Cerebellum-Network/blockchain-node/pull/300
# - name: Check Build for Benchmarking
# run: >
# pushd node &&
# cargo check --features=runtime-benchmarks --release
- name: Check Build for Try-Runtime
run: |
cargo check --features=try-runtime --release
clippy:
name: Run Clippy
needs: format
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Install linux dependencies
run: sudo apt update && sudo apt install -y cargo clang libssl-dev llvm libudev-dev protobuf-compiler
- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-05-23
override: true
target: wasm32-unknown-unknown
components: clippy
- name: Rust Cache
uses: Swatinem/rust-cache@v2
- name: Check with Clippy
run: |
cargo clippy --no-deps --all-targets --features runtime-benchmarks,try-runtime --workspace -- --deny warnings
# Disabled for one release to apply missing migrations
# https://github.com/Cerebellum-Network/blockchain-node/pull/300
# clippy:
# name: Run Clippy
# needs: format
# runs-on: ubuntu-22.04
# steps:
# - uses: actions/checkout@v3
# - name: Install linux dependencies
# run: sudo apt update && sudo apt install -y cargo clang libssl-dev llvm libudev-dev protobuf-compiler
# - name: Install nightly toolchain
# uses: actions-rs/toolchain@v1
# with:
# toolchain: nightly-2023-05-23
# override: true
# target: wasm32-unknown-unknown
# components: clippy
# - name: Rust Cache
# uses: Swatinem/rust-cache@v2
# - name: Check with Clippy
# run: |
# cargo clippy --no-deps --all-targets --features runtime-benchmarks,try-runtime --workspace -- --deny warnings

tests:
name: Run tests
Expand All @@ -98,7 +101,7 @@ jobs:
- name: Install nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-05-23
toolchain: nightly-2024-03-12
override: true
target: wasm32-unknown-unknown
- name: Rust Cache
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Legend

- [C] Changes is `Cere` Runtime
- [D] Changes is `Cere Dev` Runtime

Expand All @@ -19,6 +20,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- ...


## [5.2.0]

### Added

- [C,D] Missing storage migrations to Staking pallet

### Changed

- [C,D] Remove Society pallet
- [C,D] Bump Balances storage version

## [5.1.4]

### Changed
Expand Down Expand Up @@ -93,7 +106,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- [C,D] Updated Substrate to polkadot-v0.9.37
- Changes in `pallet-ddc-payouts::begin_billing_report` crate to accept start and end of the era.
- More explicit events in `pallet-ddc-payouts` and `pallet-ddc-customers`
- More explicit events in `pallet-ddc-payouts` about batch index

Expand Down
Loading

0 comments on commit 5b4e752

Please sign in to comment.