Skip to content

Commit 3ea0fe7

Browse files
ordianordian
committed
Merge branch 'master' into ao-disabling-statement-distribution
* master: (89 commits) Add `sudo::remove_key` (#2165) feat(frame-support-procedural): add `automaticaly_derived` attr to `NoBound` derives (#2197) [testnets][xcm-emulator] add bridge-hub-westend and hook it up to emulator (#2204) XCM builder pattern (#2107) Disable incoming light-client connections for minimal relay node (#2202) Fix "slashaed" typo (#2205) docs: fix typos (#2193) mark pallet-asset-rate optional in polkadot-runtime-common (#2187) zombienet_tests: Fix genesis error in 0006-parachains-max-tranche0.toml (#2191) Initialise on-chain `StorageVersion` for pallets added after genesis (#1297) TryDecodeEntireState check for storage types and pallets (#1805) minor: overseer availability-distribution message declaration update (#2179) approval-voting improvement: include all tranche0 assignments in one certificate (#1178) rename benchmark (#2173) Add force remove vesting (#1982) Add warning when peer_id is not available when building topology (#2140) `serde_json`: bumped to 1.0.108 (#2168) Get rid of `NetworkService` in `ChainSync` (#2143) [CI] Update deps (#2159) Fix update-ui-tests.sh (#2161) ...
2 parents fadc859 + 9adb46c commit 3ea0fe7

File tree

952 files changed

+52633
-21592
lines changed

Some content is hidden

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

952 files changed

+52633
-21592
lines changed

‎.config/zepter.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ workflows:
1515
'--features=try-runtime,runtime-benchmarks,std',
1616
# Do not try to add a new section into `[features]` of `A` only because `B` expose that feature. There are edge-cases where this is still needed, but we can add them manually.
1717
'--left-side-feature-missing=ignore',
18-
# Enabling this feature somehow pulls in two versions of `sp-runtime-interface` and makes it impossible to build that crate with `cargo b -p sp-runtime-interface`. We therefore disable it for now.
19-
'--ignore-missing-propagate=sp-core/std:bandersnatch_vrfs/std',
2018
# Ignore the case that `A` it outside of the workspace. Otherwise it will report errors in external dependencies that we have no influence on.
2119
'--left-side-outside-workspace=ignore',
2220
# Some features imply that they activate a specific dependency as non-optional. Otherwise the default behaviour with a `?` is used.

‎.github/review-bot.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,7 @@ rules:
118118
- minApprovals: 1
119119
teams:
120120
- ci
121+
122+
preventReviewRequests:
123+
teams:
124+
- core-devs

‎.github/workflows/build-and-attach-release-runtimes.yml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Build and Attach Runtimes to Releases/RC
2+
3+
on:
4+
release:
5+
types:
6+
- created
7+
8+
env:
9+
PROFILE: production
10+
11+
jobs:
12+
build_and_upload:
13+
strategy:
14+
matrix:
15+
runtime:
16+
- { name: westend, package: westend-runtime, path: polkadot/runtime/westend }
17+
- { name: rococo, package: rococo-runtime, path: polkadot/runtime/rococo }
18+
- { name: asset-hub-rococo, package: asset-hub-rococo-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-rococo }
19+
- { name: asset-hub-westend, package: asset-hub-westend-runtime, path: cumulus/parachains/runtimes/assets/asset-hub-westend }
20+
- { name: bridge-hub-rococo, package: bridge-hub-rococo-runtime, path: cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo }
21+
- { name: contracts-rococo, package: contracts-rococo-runtime, path: cumulus/parachains/runtimes/contracts/contracts-rococo }
22+
build_config:
23+
# Release build has logging disabled and no dev features
24+
- { type: on-chain-release, opts: --features on-chain-release-build }
25+
# Debug build has logging enabled and developer features
26+
- { type: dev-debug-build, opts: --features try-runtime }
27+
28+
runs-on: ubuntu-22.04
29+
30+
steps:
31+
- name: Checkout code
32+
uses: actions/checkout@v4
33+
34+
- name: Build ${{ matrix.runtime.name }} ${{ matrix.build_config.type }}
35+
id: srtool_build
36+
uses: chevdor/[email protected]
37+
env:
38+
BUILD_OPTS: ${{ matrix.build_config.opts }}
39+
with:
40+
chain: ${{ matrix.runtime.name }}
41+
package: ${{ matrix.runtime.package }}
42+
runtime_dir: ${{ matrix.runtime.path }}
43+
profile: ${{ env.PROFILE }}
44+
45+
- name: Build Summary
46+
run: |
47+
echo "${{ steps.srtool_build.outputs.json }}" | jq . > ${{ matrix.runtime.name }}-srtool-digest.json
48+
cat ${{ matrix.runtime.name }}-srtool-digest.json
49+
echo "Runtime location: ${{ steps.srtool_build.outputs.wasm }}"
50+
51+
- name: Set up paths and runtime names
52+
id: setup
53+
run: |
54+
RUNTIME_BLOB_NAME=$(echo ${{ matrix.runtime.package }} | sed 's/-/_/g').compact.compressed.wasm
55+
PREFIX=${{ matrix.build_config.type == 'dev-debug-build' && 'DEV_DEBUG_BUILD__' || '' }}
56+
57+
echo "RUNTIME_BLOB_NAME=$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
58+
echo "ASSET_PATH=./${{ matrix.runtime.path }}/target/srtool/${{ env.PROFILE }}/wbuild/${{ matrix.runtime.package }}/$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
59+
echo "ASSET_NAME=$PREFIX$RUNTIME_BLOB_NAME" >> $GITHUB_ENV
60+
61+
- name: Upload Runtime to Release
62+
uses: actions/upload-release-asset@v1
63+
with:
64+
upload_url: ${{ github.event.release.upload_url }}
65+
asset_path: ${{ env.ASSET_PATH }}
66+
asset_name: ${{ env.ASSET_NAME }}
67+
asset_content_type: application/octet-stream
68+
env:
69+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/check-publish.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Check publish
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
types: [opened, synchronize, reopened, ready_for_review]
9+
10+
jobs:
11+
check-publish:
12+
strategy:
13+
matrix:
14+
os: ["ubuntu-latest"]
15+
runs-on: ${{ matrix.os }}
16+
steps:
17+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
18+
19+
- name: Rust Cache
20+
uses: Swatinem/rust-cache@3cf7f8cc28d1b4e7d01e3783be10a97d55d483c8 # v2.7.1
21+
with:
22+
cache-on-failure: true
23+
24+
- name: install parity-publish
25+
run: cargo install parity-publish --profile dev
26+
27+
- name: parity-publish check
28+
run: parity-publish check --allow-unpublished

‎.github/workflows/fmt-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
os: ["ubuntu-latest"]
1515
runs-on: ${{ matrix.os }}
1616
container:
17-
image: paritytech/ci-unified:bullseye-1.70.0-2023-05-23-v20230706
17+
image: paritytech/ci-unified:bullseye-1.73.0-2023-11-01-v20231025
1818
steps:
1919
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2020

‎.github/workflows/review-bot.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,27 @@ on:
66
types:
77
- completed
88

9-
permissions:
10-
contents: read
11-
129
jobs:
1310
review-approvals:
1411
runs-on: ubuntu-latest
12+
environment: master
1513
steps:
1614
- name: Extract content of artifact
1715
id: number
1816
uses: Bullrich/[email protected]
1917
with:
2018
artifact-name: pr_number
2119
- name: Generate token
22-
id: team_token
20+
id: app_token
2321
uses: tibdex/github-app-token@v1
2422
with:
2523
app_id: ${{ secrets.REVIEW_APP_ID }}
2624
private_key: ${{ secrets.REVIEW_APP_KEY }}
2725
- name: "Evaluates PR reviews and assigns reviewers"
28-
uses: paritytech/review-bot@v2.1.0
26+
uses: paritytech/review-bot@v2.2.0
2927
with:
30-
repo-token: ${{ secrets.GITHUB_TOKEN }}
31-
team-token: ${{ steps.team_token.outputs.token }}
32-
checks-token: ${{ steps.team_token.outputs.token }}
28+
repo-token: ${{ steps.app_token.outputs.token }}
29+
team-token: ${{ steps.app_token.outputs.token }}
30+
checks-token: ${{ steps.app_token.outputs.token }}
3331
pr-number: ${{ steps.number.outputs.content }}
32+
request-reviewers: true

‎.github/workflows/review-trigger.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313

1414
jobs:
1515
trigger-review-bot:
16+
if: github.event.pull_request.draft != true
1617
runs-on: ubuntu-latest
1718
name: trigger review bot
1819
steps:

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
3131
NEXTEST_FAILURE_OUTPUT: immediate-final
3232
NEXTEST_SUCCESS_OUTPUT: final
33-
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.71"
33+
ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.79"
3434
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
3535

3636
default:

‎.gitlab/check-each-crate.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
crates = []
2020
for line in output.splitlines():
2121
if line != b"":
22-
crates.append(line.decode('utf8').split(" ")[0])
22+
line = line.decode('utf8').split(" ")
23+
crate_name = line[0]
24+
# The crate path is always the last element in the line.
25+
crate_path = line[len(line) - 1].replace("(", "").replace(")", "")
26+
crates.append((crate_name, crate_path))
2327

2428
# Make the list unique and sorted
2529
crates = list(set(crates))
@@ -49,9 +53,9 @@
4953
for i in range(0, crates_per_group + overflow_crates):
5054
crate = crates_per_group * target_group + i
5155

52-
print(f"Checking {crates[crate]}", file=sys.stderr)
56+
print(f"Checking {crates[crate][0]}", file=sys.stderr)
5357

54-
res = subprocess.run(["cargo", "check", "--locked", "-p", crates[crate]])
58+
res = subprocess.run(["cargo", "check", "--locked"], cwd = crates[crate][1])
5559

5660
if res.returncode != 0:
5761
sys.exit(1)

‎.gitlab/pipeline/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ build-linux-substrate:
305305
# see https://github.com/paritytech/ci_cd/issues/682#issuecomment-1340953589
306306
- git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
307307
script:
308-
- WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p node-cli
308+
- WASM_BUILD_NO_COLOR=1 time cargo build --locked --release -p staging-node-cli
309309
- mv $CARGO_TARGET_DIR/release/substrate-node ./artifacts/substrate/substrate
310310
- echo -n "Substrate version = "
311311
- if [ "${CI_COMMIT_TAG}" ]; then

0 commit comments

Comments
 (0)