Skip to content

Commit a5a91b5

Browse files
committed
Merge branch 'voting_hook' of github.com:ndkazu/polkadot-sdk into voting_hook
2 parents 84865b0 + 8191677 commit a5a91b5

File tree

448 files changed

+17743
-5937
lines changed

Some content is hidden

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

448 files changed

+17743
-5937
lines changed

.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/checks-quick.yml

-1
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:

0 commit comments

Comments
 (0)