From 0f485afcec8e733236dc23aa124236e13ecb886c Mon Sep 17 00:00:00 2001 From: gilescope Date: Wed, 27 Jul 2022 10:56:07 +0100 Subject: [PATCH 1/3] add slurp --- .gitignore | 2 +- scripts/ci/changelog/bin/changelog | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 24eaf986813..6e39a095abe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,4 @@ polkadot_argument_parsing **/chains/ *.iml .env -bin +/bin diff --git a/scripts/ci/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog index e9df4a4ca2b..d70c09209f6 100755 --- a/scripts/ci/changelog/bin/changelog +++ b/scripts/ci/changelog/bin/changelog @@ -76,6 +76,7 @@ else logger.debug("Re-using:#{substrate_data}") end +POLKADOT_COLLECTIVES_DIGEST = ENV['SHELL_DIGEST'] || 'digests/polkadot-collectives-srtool-digest.json' SHELL_DIGEST = ENV['SHELL_DIGEST'] || 'digests/shell-srtool-digest.json' WESTMINT_DIGEST = ENV['WESTMINT_DIGEST'] || 'digests/westmint-srtool-digest.json' STATEMINE_DIGEST = ENV['STATEMINE_DIGEST'] || 'digests/statemine-srtool-digest.json' @@ -106,6 +107,7 @@ else --slurpfile cumulus %s \ --slurpfile substrate %s \ --slurpfile polkadot %s \ + --slurpfile srtool_polkadot_collectives %s \ --slurpfile srtool_shell %s \ --slurpfile srtool_westmint %s \ --slurpfile srtool_statemine %s \ @@ -117,6 +119,7 @@ else substrate: $substrate[0], polkadot: $polkadot[0], srtool: [ + { name: "polkadot-collectives", data: $srtool_polkadot_collectives_parachain[0] }, { name: "rococo", data: $srtool_rococo_parachain[0] }, { name: "shell", data: $srtool_shell[0] }, { name: "westmint", data: $srtool_westmint[0] }, @@ -124,6 +127,7 @@ else { name: "statemine", data: $srtool_statemine[0] }, { name: "contracts", data: $srtool_contracts_rococo[0] } ] }\' > context.json', cumulus_data, substrate_data, polkadot_data, + POLKADOT_COLLECTIVES_DIGEST, SHELL_DIGEST, WESTMINT_DIGEST, STATEMINE_DIGEST, From 5eb74b0a43700070fceaeadd1f441aa690685648 Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Thu, 4 Aug 2022 12:19:07 +0200 Subject: [PATCH 2/3] Slurp better :) --- scripts/ci/changelog/bin/changelog | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/ci/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog index d70c09209f6..575a7d7ad3d 100755 --- a/scripts/ci/changelog/bin/changelog +++ b/scripts/ci/changelog/bin/changelog @@ -107,33 +107,37 @@ else --slurpfile cumulus %s \ --slurpfile substrate %s \ --slurpfile polkadot %s \ - --slurpfile srtool_polkadot_collectives %s \ --slurpfile srtool_shell %s \ --slurpfile srtool_westmint %s \ --slurpfile srtool_statemine %s \ --slurpfile srtool_statemint %s \ --slurpfile srtool_rococo_parachain %s \ --slurpfile srtool_contracts_rococo %s \ + --slurpfile srtool_polkadot_collectives %s \ -n \'{ cumulus: $cumulus[0], substrate: $substrate[0], polkadot: $polkadot[0], srtool: [ - { name: "polkadot-collectives", data: $srtool_polkadot_collectives_parachain[0] }, + { name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] }, { name: "rococo", data: $srtool_rococo_parachain[0] }, { name: "shell", data: $srtool_shell[0] }, { name: "westmint", data: $srtool_westmint[0] }, { name: "statemint", data: $srtool_statemint[0] }, { name: "statemine", data: $srtool_statemine[0] }, { name: "contracts", data: $srtool_contracts_rococo[0] } - ] }\' > context.json', cumulus_data, substrate_data, polkadot_data, - POLKADOT_COLLECTIVES_DIGEST, - SHELL_DIGEST, - WESTMINT_DIGEST, - STATEMINE_DIGEST, - STATEMINT_DIGEST, - ROCOCO_PARA_DIGEST, - CANVAS_KUSAMA_DIGEST) + ] }\' > context.json', + cumulus_data, + substrate_data, + polkadot_data, + SHELL_DIGEST, + WESTMINT_DIGEST, + STATEMINE_DIGEST, + STATEMINT_DIGEST, + ROCOCO_PARA_DIGEST, + CANVAS_KUSAMA_DIGEST, + POLKADOT_COLLECTIVES_DIGEST + ) end system(cmd) From 97b07e98875ff96da918bbb9f5af30a593e1c498 Mon Sep 17 00:00:00 2001 From: Wilfried Kopp Date: Thu, 4 Aug 2022 12:22:23 +0200 Subject: [PATCH 3/3] Bring some order --- scripts/ci/changelog/bin/changelog | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/ci/changelog/bin/changelog b/scripts/ci/changelog/bin/changelog index 575a7d7ad3d..97d10dff94b 100755 --- a/scripts/ci/changelog/bin/changelog +++ b/scripts/ci/changelog/bin/changelog @@ -115,17 +115,17 @@ else --slurpfile srtool_contracts_rococo %s \ --slurpfile srtool_polkadot_collectives %s \ -n \'{ - cumulus: $cumulus[0], - substrate: $substrate[0], - polkadot: $polkadot[0], + cumulus: $cumulus[0], + substrate: $substrate[0], + polkadot: $polkadot[0], srtool: [ - { name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] }, - { name: "rococo", data: $srtool_rococo_parachain[0] }, - { name: "shell", data: $srtool_shell[0] }, - { name: "westmint", data: $srtool_westmint[0] }, - { name: "statemint", data: $srtool_statemint[0] }, - { name: "statemine", data: $srtool_statemine[0] }, - { name: "contracts", data: $srtool_contracts_rococo[0] } + { name: "shell", data: $srtool_shell[0] }, + { name: "westmint", data: $srtool_westmint[0] }, + { name: "statemine", data: $srtool_statemine[0] }, + { name: "statemint", data: $srtool_statemint[0] }, + { name: "rococo", data: $srtool_rococo_parachain[0] }, + { name: "contracts", data: $srtool_contracts_rococo[0] } + { name: "polkadot-collectives", data: $srtool_polkadot_collectives[0] }, ] }\' > context.json', cumulus_data, substrate_data,