Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polkadot SDK Update V2 #972

Merged
merged 30 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/parachain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
SKIP_WASM_BUILD: 1
steps:
- uses: actions/checkout@v2
with:
submodules: "true"
- uses: actions/cache@v1
with:
path: |
Expand Down Expand Up @@ -61,6 +63,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
submodules: "true"
- uses: actions/cache@v1
with:
path: |
Expand Down Expand Up @@ -108,6 +111,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
submodules: "true"
- name: setup rust toolchain
run: rustup show
- name: run coverage test
Expand Down Expand Up @@ -139,7 +143,7 @@ jobs:
- name: check bridge-hub runtime
run: >
cargo check
--manifest-path cumulus/Cargo.toml
--manifest-path polkadot-sdk/Cargo.toml
--release --verbose
--package bridge-hub-rococo-runtime

Expand All @@ -156,6 +160,7 @@ jobs:
- uses: actions/checkout@v2
with:
ref: ${{ github.head_ref }}
submodules: "true"
- uses: actions/cache@v1
with:
path: |
Expand Down
7 changes: 3 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[submodule "cumulus"]
path = cumulus
url = https://github.com/Snowfork/cumulus
branch = snowbridge
[submodule "polkadot-sdk"]
path = polkadot-sdk
url = https://github.com/Snowfork/polkadot-sdk.git
[submodule "contracts/lib/forge-std"]
path = contracts/lib/forge-std
url = https://github.com/foundry-rs/forge-std
Expand Down
2 changes: 1 addition & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ extend-exclude = [
"**/*ffi*.js",
"**/*mock*.rs",
"**/*data*.rs",
"cumulus/**",
"polkadot-sdk/**",
"smoketest/src/parachains",
"smoketest/src/contracts",
]
1 change: 0 additions & 1 deletion cumulus
Submodule cumulus deleted from 877c23
14 changes: 0 additions & 14 deletions hooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@

set -e

# checks that the cumulus submodule is in sync with our substrate dependencies
check_duplicate_versions() {
local duplicates=$(grep -Ei "source = \"git.*$1" cumulus/Cargo.lock parachain/Cargo.lock | sed 's/\.git//g' | sort -u)
local version_count=$(echo "$duplicates" | awk -F':' '{for (i=2; i<NF; i++) printf $i " "; print $NF}' | sort -u | wc -l | xargs)
if [ "$version_count" != "1" ]; then
echo Duplicate $1 versions detected
echo "$duplicates"
exit 1
fi
}

# check typos
chronic typos .

Expand All @@ -24,6 +13,3 @@ chronic typos .

# check format of rust
(cd parachain && chronic cargo +$RUST_NIGHTLY_VERSION fmt --check)

check_duplicate_versions substrate
check_duplicate_versions polkadot
Loading
Loading