Skip to content

Commit a339922

Browse files
authored
Merge branch 'master' into polkadot-stable2503
2 parents d010dce + 9869331 commit a339922

File tree

47 files changed

+119
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+119
-80
lines changed

.codespell/codespellrc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[codespell]
2+
skip = .git,Cargo.lock
3+
count =
4+
quiet-level = 3
5+
ignore-words = ./.codespell/ignore.txt

.codespell/ignore.txt

Whitespace-only changes.

.codespell/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
codespell==2.4.1

.github/workflows/codespell.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# A Github action that using codespell to check spelling.
2+
# see .codespell/* for configs
3+
# https://github.com/codespell-project/codespell
4+
5+
name: codespell
6+
7+
on:
8+
# Triggers the workflow on push or pull request against main
9+
push:
10+
branches: [master]
11+
pull_request:
12+
branches: [master]
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
16+
jobs:
17+
codespell:
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
- name: Checkout the repository
22+
uses: actions/checkout@v4
23+
24+
- name: Setup python
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: '3.x'
28+
29+
- name: Install codespell requirements
30+
run: pip install -r ./.codespell/requirements.txt
31+
32+
- name: Spell check
33+
run: codespell --config=./.codespell/codespellrc

.github/workflows/coverage.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ jobs:
3737
tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
3838
make Cargo.toml
3939
cargo update
40-
cargo update [email protected] --precise 3.6.12
41-
cargo update [email protected] --precise 3.6.12
4240
cargo tarpaulin --verbose --no-fail-fast --workspace --timeout 300 --out Xml
4341
- name: Upload to codecov.io
4442
uses: codecov/codecov-action@v3

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ jobs:
3636
- name: Update
3737
run: |
3838
cargo update
39-
cargo update [email protected] --precise 3.6.12
40-
cargo update [email protected] --precise 3.6.12
4139
- name: Run clippy
4240
run: cargo clippy -- -D warnings
4341
- name: Check for Wasm

Cargo.dev.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ xcm = { version = "16.1.0", package = "staging-xcm", default-features = false }
6868
xcm-builder = { version = "20.0.0", package = "staging-xcm-builder", default-features = false }
6969
xcm-executor = { version = "19.1.0", package = "staging-xcm-executor", default-features = false }
7070

71-
xcm-simulator = { version = "20.0.0" }
71+
xcm-simulator = { version = "20.0.0" }

asset-registry/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-asset-registry"
33
description = "Registry for (foreign) assets"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/asset-registry"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Interlay Ltd, etc"]
88
edition = "2021"
99

@@ -27,7 +27,7 @@ xcm-builder = { workspace = true }
2727
xcm-executor = { workspace = true }
2828

2929
# orml
30-
orml-traits = { path = "../traits", version = "1.2.1", default-features = false }
30+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
3131

3232
# for runtime-benchmarks
3333
polkadot-runtime-common = { workspace = true, optional = true }

auction/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-auction"
33
description = "Auction module that implements `Auction` trait."
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

@@ -17,7 +17,7 @@ frame-system = { workspace = true }
1717
sp-runtime = { workspace = true }
1818
sp-std = { workspace = true }
1919

20-
orml-traits = { path = "../traits", version = "1.2.1", default-features = false }
20+
orml-traits = { path = "../traits", version = "1.3.0", default-features = false }
2121

2222
[dev-dependencies]
2323
sp-core = { workspace = true, features = ["std"] }

authority/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "orml-authority"
33
description = "Utility pallet to perform ROOT calls in a PoA network"
44
repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/auction"
55
license = "Apache-2.0"
6-
version = "1.2.1"
6+
version = "1.3.0"
77
authors = ["Acala Developers"]
88
edition = "2021"
99

0 commit comments

Comments
 (0)