Skip to content

Commit a896032

Browse files
committed
Merge branch 'master' into s0me0ne/yap-ng
* master: (58 commits) Upgrade link-checker cache to v4 (#7874) Updating readmes (#7950) Cumulus: Remove some old scripts (#7946) pallet-bounties: allow bounties to never expire (#7723) run frame-omni-bencher overhead command in CI for all runtimes in the runtime matrix (#7459) Update README.md for Cumulus (#7930) FRAME: Meta Transaction (#6428) Follow up for: Use the umbrella crate for the parachain template #5993 (#7464) Add an extra_constant to pallet-treasury (#7918) Bump the ci_dependencies group across 1 directory with 4 updates (#7855) remove compromised action (#7934) Fixing token-economics dead link (#5302) [pallet-revive] Fix pallet-revive-fixtures build.rs (#7928) cumulus: fix pov exporter format (#7923) sp-api: Support `mut` in `impl_runtime_apis!` (#7924) Remove clones from block seal function (#7917) [pallet-revive] precompiles 2->9 (#7810) Use non-native token to benchmark xcm on asset hub (#7893) [CI] bump timeout wait for build in zombienet workflows. (#7871) taplo: split long array line to multiline array (#7905) ...
2 parents c5cdce1 + 1abdb7f commit a896032

File tree

447 files changed

+16555
-5576
lines changed

Some content is hidden

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

447 files changed

+16555
-5576
lines changed

.config/lychee.toml

+3-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ exclude_all_private = true
1313
accept = [
1414
# Ok
1515
"200",
16-
1716
# Rate limited - GitHub likes to throw this.
1817
"429",
1918
]
@@ -27,7 +26,6 @@ exclude = [
2726
# Place holders (no need to fix these):
2827
"http://visitme/",
2928
"https://visitme/",
30-
3129
# TODO meta issue: <https://github.com/paritytech/polkadot-sdk/issues/134>
3230
"https://docs.substrate.io/main-docs/build/custom-rpc/#public-rpcs",
3331
"https://docs.substrate.io/rustdocs/latest/sp_api/macro.decl_runtime_apis.html",
@@ -48,18 +46,18 @@ exclude = [
4846
"https://w3f.github.io/parachain-implementers-guide/node/index.html",
4947
"https://w3f.github.io/parachain-implementers-guide/protocol-chain-selection.html",
5048
"https://w3f.github.io/parachain-implementers-guide/runtime/session_info.html",
51-
5249
# Behind a captcha (code 403):
5350
"https://chainlist.org/chain/*",
5451
"https://iohk.io/en/blog/posts/2023/11/03/partner-chains-are-coming-to-cardano/",
5552
"https://polymesh.network",
5653
"https://www.reddit.com/r/rust/comments/3spfh1/does_collect_allocate_more_than_once_while/",
57-
5854
# 403 rate limited:
5955
"https://etherscan.io/block/11090290",
6056
"https://subscan.io/",
6157
"https://substrate.stackexchange.com/.*",
62-
58+
# Broken for link-checker CI, but works in browser and local machine
59+
"http://www.gnu.org/licenses/",
60+
"https://www.gnu.org/licenses/",
6361
# Exclude strings which contain templates like {} and {:?}
6462
"%7B%7D",
6563
"%7B:\\?}",

.config/taplo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ exclude = [
66
"cumulus/zombienet/**",
77
"polkadot/node/malus/integrationtests/**",
88
"polkadot/zombienet_tests/**",
9+
"substrate/client/transaction-pool/tests/zombienet/**",
910
"substrate/zombienet/**",
1011
"target/**",
1112
]
@@ -14,7 +15,7 @@ exclude = [
1415
[formatting]
1516
reorder_arrays = true
1617
inline_table_expand = false
17-
array_auto_expand = false
18+
array_auto_expand = true
1819
array_auto_collapse = false
1920
indent_string = " " # tab
2021

.github/scripts/common/lib.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,17 @@ fetch_release_artifacts() {
243243
# - REPO in the form paritytech/polkadot
244244
fetch_debian_package_from_s3() {
245245
BINARY=$1
246-
echo "Version : $VERSION"
246+
echo "Version : $NODE_VERSION"
247247
echo "Repo : $REPO"
248248
echo "Binary : $BINARY"
249-
echo "Tag : $RELEASE_TAG"
249+
echo "Tag : $VERSION"
250250
OUTPUT_DIR=${OUTPUT_DIR:-"./release-artifacts/${BINARY}"}
251251
echo "OUTPUT_DIR : $OUTPUT_DIR"
252252

253253
URL_BASE=$(get_s3_url_base $BINARY)
254254
echo "URL_BASE=$URL_BASE"
255255

256-
URL=$URL_BASE/$RELEASE_TAG/x86_64-unknown-linux-gnu/${BINARY}_${VERSION}_amd64.deb
256+
URL=$URL_BASE/$VERSION/x86_64-unknown-linux-gnu/${BINARY}_${NODE_VERSION}_amd64.deb
257257

258258
mkdir -p "$OUTPUT_DIR"
259259
pushd "$OUTPUT_DIR" > /dev/null

.github/scripts/release/release_lib.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ git_show_log() {
7171
# 1_012_000 or 1_012_001 if SUFFIX is set
7272
function get_spec_version() {
7373
INPUT=$1
74-
SUFFIX=${SUFFIX:-000} #this variable makes it possible to set a specific ruuntime version like 93826 it can be intialised as sestem variable
74+
SUFFIX=${SUFFIX:-000} #this variable makes it possible to set a specific runtime version like 93826 it can be initialised as system variable
7575
[[ $INPUT =~ .*([0-9]+\.[0-9]+\.[0-9]{1,2}).* ]]
7676
VERSION="${BASH_REMATCH[1]}"
7777
MATCH="${BASH_REMATCH[0]}"

.github/workflows/build-publish-images.yml

+63
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,9 @@ jobs:
266266
path: artifacts.tar
267267
retention-days: 1
268268

269+
270+
### Build zombienet test artifacts ########################
271+
269272
#
270273
#
271274
#
@@ -296,6 +299,66 @@ jobs:
296299
path: artifacts.tar
297300
retention-days: 1
298301

302+
#
303+
#
304+
#
305+
prepare-polkadot-zombienet-artifacts:
306+
needs: [preflight]
307+
runs-on: ${{ needs.preflight.outputs.RUNNER }}
308+
timeout-minutes: 60
309+
container:
310+
image: ${{ needs.preflight.outputs.IMAGE }}
311+
steps:
312+
- name: Checkout
313+
uses: actions/checkout@v4
314+
- name: build
315+
run: |
316+
forklift cargo nextest --manifest-path polkadot/zombienet-sdk-tests/Cargo.toml archive --locked --features zombie-metadata --archive-file polkadot-zombienet-tests.tar.zst
317+
- name: pack artifacts
318+
run: |
319+
mkdir -p artifacts
320+
cp polkadot-zombienet-tests.tar.zst ./artifacts
321+
322+
- name: tar
323+
run: tar -cvf artifacts.tar artifacts
324+
325+
- name: upload artifacts
326+
uses: actions/upload-artifact@v4
327+
with:
328+
name: ${{ github.job }}-${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
329+
path: artifacts.tar
330+
retention-days: 1
331+
332+
#
333+
#
334+
#
335+
prepare-cumulus-zombienet-artifacts:
336+
needs: [preflight]
337+
runs-on: ${{ needs.preflight.outputs.RUNNER }}
338+
timeout-minutes: 60
339+
container:
340+
image: ${{ needs.preflight.outputs.IMAGE }}
341+
steps:
342+
- name: Checkout
343+
uses: actions/checkout@v4
344+
- name: build
345+
run: |
346+
forklift cargo nextest --manifest-path cumulus/zombienet/zombienet-sdk/Cargo.toml archive --locked --features zombie-ci --archive-file cumulus-zombienet-tests.tar.zst
347+
- name: pack artifacts
348+
run: |
349+
mkdir -p artifacts
350+
cp cumulus-zombienet-tests.tar.zst ./artifacts
351+
352+
- name: tar
353+
run: tar -cvf artifacts.tar artifacts
354+
355+
- name: upload artifacts
356+
uses: actions/upload-artifact@v4
357+
with:
358+
name: ${{ github.job }}-${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
359+
path: artifacts.tar
360+
retention-days: 1
361+
299362
### Publish ########################
300363

301364
#

.github/workflows/check-frame-omni-bencher.yml

+14-3
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ jobs:
7979
fail-fast: false # keep running other workflows even if one fails, to see the logs of all possible failures
8080
matrix:
8181
runtime: ${{ fromJSON(needs.runtime-matrix.outputs.runtime) }}
82+
bench_cmd: ["pallet", "overhead"]
8283
container:
8384
image: ${{ needs.preflight.outputs.IMAGE }}
8485
env:
@@ -89,16 +90,26 @@ jobs:
8990
- name: Checkout
9091
uses: actions/checkout@v4
9192

92-
- name: script
93+
- name: script (benchmark ${{ matrix.bench_cmd }})
9394
id: required
95+
shell: bash
9496
run: |
9597
RUNTIME_BLOB_NAME=$(echo $PACKAGE_NAME | sed 's/-/_/g').compact.compressed.wasm
9698
RUNTIME_BLOB_PATH=./target/release/wbuild/$PACKAGE_NAME/$RUNTIME_BLOB_NAME
99+
BENCH_CMD=${{ matrix.bench_cmd }}
97100
forklift cargo build --release --locked -p $PACKAGE_NAME -p frame-omni-bencher --features=${{ matrix.runtime.bench_features }} --quiet
98-
echo "Running short benchmarking for PACKAGE_NAME=$PACKAGE_NAME and RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH"
101+
echo "Running short $BENCH_CMD benchmarking for PACKAGE_NAME=$PACKAGE_NAME and RUNTIME_BLOB_PATH=$RUNTIME_BLOB_PATH"
99102
ls -lrt $RUNTIME_BLOB_PATH
103+
104+
if [[ "$BENCH_CMD" == "pallet" ]]; then
105+
cmd="./target/release/frame-omni-bencher v1 benchmark pallet --runtime $RUNTIME_BLOB_PATH --all --steps 2 --repeat 1 $FLAGS"
106+
elif [[ "$BENCH_CMD" == "overhead" ]]; then
107+
cmd="./target/release/frame-omni-bencher v1 benchmark overhead --runtime $RUNTIME_BLOB_PATH"
108+
else
109+
echo "Error: Unknown BENCH_CMD value: $BENCH_CMD"
110+
exit 1
111+
fi
100112
101-
cmd="./target/release/frame-omni-bencher v1 benchmark pallet --runtime $RUNTIME_BLOB_PATH --all --steps 2 --repeat 1 $FLAGS"
102113
echo "Running command: $cmd"
103114
eval "$cmd"
104115
- name: Stop all workflows if failed

.github/workflows/check-links.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
timeout-minutes: 10
2727
steps:
2828
- name: Restore lychee cache
29-
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v3.3.2 (7. Sep 2023)
29+
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2 (12. March 2025)
3030
with:
3131
path: .lycheecache
3232
key: cache-lychee-${{ github.sha }}

.github/workflows/checks-quick.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ jobs:
102102
--exclude
103103
"substrate/frame/contracts/fixtures/build"
104104
"substrate/frame/contracts/fixtures/contracts/common"
105-
"substrate/frame/revive/fixtures/contracts/common"
106105
- name: deny git deps
107106
run: python3 .github/scripts/deny-git-deps.py .
108107
check-markdown:
@@ -203,7 +202,7 @@ jobs:
203202
echo "RUST_VERSION=${RUST_VERSION}" >> $GITHUB_ENV
204203
205204
- name: Install Rust
206-
uses: actions-rust-lang/setup-rust-toolchain@11df97af8e8102fd60b60a77dfbf58d40cd843b8 # v1.10.1
205+
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
207206
with:
208207
cache: false
209208
toolchain: ${{ env.RUST_VERSION }}

0 commit comments

Comments
 (0)