git.delta.rocks / unique-network / refs/commits / 56c4087ab1ae

difftreelog

ci relay_chain argument for baedeker

Yaroslav Bolyukin2023-09-03parent: #98753ec.patch.diff
in: master

5 files changed

modified.baedeker/xcm-opal.jsonnetdiffbeforeafterboth
--- a/.baedeker/xcm-opal.jsonnet
+++ b/.baedeker/xcm-opal.jsonnet
@@ -2,12 +2,14 @@
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
+function(relay_spec)
+
 local relay = {
 	name: 'relay',
 	bin: 'bin/polkadot',
 	validatorIdAssignment: 'staking',
 	spec: {Genesis:{
-		chain: 'westend-local',
+		chain: relay_spec,
 		modify:: m.genericRelay($, hrmp = [
 			[$.parachains.opal.paraId, $.parachains.westmint.paraId, 8, 512],
 			[$.parachains.westmint.paraId, $.parachains.opal.paraId, 8, 512],
modified.baedeker/xcm-quartz.jsonnetdiffbeforeafterboth
before · .baedeker/xcm-quartz.jsonnet
1local2m = import 'baedeker-library/mixin/spec.libsonnet',3;45local relay = {6	name: 'relay',7	bin: 'bin/polkadot',8	validatorIdAssignment: 'staking',9	spec: {Genesis:{10		chain: 'westend-local',11		modify:: m.genericRelay($, hrmp = std.join([], [12			[[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],13			for [a, b] in [14				['quartz', 'karura'],15				['quartz', 'moonriver'],16				['quartz', 'statemine'],17				['quartz', 'shiden'],18			]19		])),20	}},21	nodes: {22		[name]: {23			bin: $.bin,24			wantedKeys: 'relay',25		},26		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']27	},28};2930local quartz = {31	name: 'quartz',32	bin: 'bin/unique',33	paraId: 1001,34	spec: {Genesis:{35		modify:: m.genericPara($),36	}},37	nodes: {38		[name]: {39			bin: $.bin,40			wantedKeys: 'para',41		},42		for name in ['alice', 'bob']43	},44};4546local karura = {47	name: 'karura',48	bin: 'bin/acala',49	paraId: 1002,50	spec: {Genesis:{51		chain: 'karura-dev',52		modify:: bdk.mixer([53			m.genericPara($),54			function(prev) prev {id+: '-local'},55		]),56	}},57	nodes: {58		[name]: {59			bin: $.bin,60			wantedKeys: 'para',61			legacyRpc: true,62		},63		for name in ['alice', 'bob']64	},65};6667local moonriver = {68	name: 'moonriver',69	bin: 'bin/moonbeam',70	signatureSchema: 'Ethereum',71	paraId: 1003,72	spec: {Genesis:{73		chain: 'moonriver-local',74		specFilePrefix: 'moonriver-local-',75		modify:: m.genericPara($),76	}},77	nodes: {78		[name]: {79			bin: $.bin,80			wantedKeys: 'para-nimbus',81			legacyRpc: true,82		},83		for name in ['alice', 'bob']84	},85};8687local statemine = {88	name: 'statemine',89	bin: 'bin/cumulus',90	paraId: 1004,91	spec: {Genesis:{92		chain: 'statemine-local',93		modify:: m.genericPara($),94	}},95	nodes: {96		[name]: {97			bin: $.bin,98			wantedKeys: 'para',99		},100		for name in ['alice', 'bob']101	},102};103104local shiden = {105	name: 'shiden',106	bin: 'bin/astar',107	paraId: 1005,108	spec: {Genesis:{109		chain: 'shiden-dev',110		modify:: m.genericPara($),111	}},112	nodes: {113		[name]: {114			bin: $.bin,115			wantedKeys: 'para',116			legacyRpc: true,117		},118		for name in ['alice', 'bob']119	},120};121122relay + {123	parachains: {124		[para.name]: para,125		for para in [quartz, karura, moonriver, statemine, shiden]126	},127}
after · .baedeker/xcm-quartz.jsonnet
1local2m = import 'baedeker-library/mixin/spec.libsonnet',3;45function(relay_spec)67local relay = {8	name: 'relay',9	bin: 'bin/polkadot',10	validatorIdAssignment: 'staking',11	spec: {Genesis:{12		chain: relay_spec,13		modify:: m.genericRelay($, hrmp = std.join([], [14			[[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],15			for [a, b] in [16				['quartz', 'karura'],17				['quartz', 'moonriver'],18				['quartz', 'statemine'],19				['quartz', 'shiden'],20			]21		])),22	}},23	nodes: {24		[name]: {25			bin: $.bin,26			wantedKeys: 'relay',27		},28		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']29	},30};3132local quartz = {33	name: 'quartz',34	bin: 'bin/unique',35	paraId: 1001,36	spec: {Genesis:{37		modify:: m.genericPara($),38	}},39	nodes: {40		[name]: {41			bin: $.bin,42			wantedKeys: 'para',43		},44		for name in ['alice', 'bob']45	},46};4748local karura = {49	name: 'karura',50	bin: 'bin/acala',51	paraId: 1002,52	spec: {Genesis:{53		chain: 'karura-dev',54		modify:: bdk.mixer([55			m.genericPara($),56			function(prev) prev {id+: '-local'},57		]),58	}},59	nodes: {60		[name]: {61			bin: $.bin,62			wantedKeys: 'para',63			legacyRpc: true,64		},65		for name in ['alice', 'bob']66	},67};6869local moonriver = {70	name: 'moonriver',71	bin: 'bin/moonbeam',72	signatureSchema: 'Ethereum',73	paraId: 1003,74	spec: {Genesis:{75		chain: 'moonriver-local',76		specFilePrefix: 'moonriver-local-',77		modify:: m.genericPara($),78	}},79	nodes: {80		[name]: {81			bin: $.bin,82			wantedKeys: 'para-nimbus',83			legacyRpc: true,84		},85		for name in ['alice', 'bob']86	},87};8889local statemine = {90	name: 'statemine',91	bin: 'bin/cumulus',92	paraId: 1004,93	spec: {Genesis:{94		chain: 'statemine-local',95		modify:: m.genericPara($),96	}},97	nodes: {98		[name]: {99			bin: $.bin,100			wantedKeys: 'para',101		},102		for name in ['alice', 'bob']103	},104};105106local shiden = {107	name: 'shiden',108	bin: 'bin/astar',109	paraId: 1005,110	spec: {Genesis:{111		chain: 'shiden-dev',112		modify:: m.genericPara($),113	}},114	nodes: {115		[name]: {116			bin: $.bin,117			wantedKeys: 'para',118		},119		for name in ['alice', 'bob']120	},121};122123relay + {124	parachains: {125		[para.name]: para,126		for para in [quartz, karura, moonriver, statemine, shiden]127	},128}
modified.baedeker/xcm-unique.jsonnetdiffbeforeafterboth
--- a/.baedeker/xcm-unique.jsonnet
+++ b/.baedeker/xcm-unique.jsonnet
@@ -2,12 +2,14 @@
 m = import 'baedeker-library/mixin/spec.libsonnet',
 ;
 
+function(relay_spec)
+
 local relay = {
 	name: 'relay',
 	bin: 'bin/polkadot',
 	validatorIdAssignment: 'staking',
 	spec: {Genesis:{
-		chain: 'westend-local',
+		chain: relay_spec,
 		modify:: m.genericRelay($, hrmp = std.join([], [
 			[[$.parachains[a].paraId, $.parachains[b].paraId, 8, 512], [$.parachains[b].paraId, $.parachains[a].paraId, 8, 512]],
 			for [a, b] in [
modified.github/actions/prepare/action.ymldiffbeforeafterboth
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -14,7 +14,16 @@
       shell: bash  
       run: |  
         echo "LAST_COMMIT_SHA=${GITHUB_SHA}" >> ${GITHUB_ENV}
-    - name: Set build SHA
+    - name: Run find-and-replace to remove slashes from branch name
+      uses: mad9000/actions-find-and-replace-string@4
+      id: ref_slug
+      with:
+        source: ${{ github.head_ref }}
+        find: '/'
+        replace: '-'
+    - name: Set BUILD_SHA, REF_SLUG
       shell: bash
       run: |
         echo "BUILD_SHA=${LAST_COMMIT_SHA:0:8}" >> $GITHUB_ENV
+        echo "REF_SLUG=${{ steps.ref_slug.outputs.value }}" >> $GITHUB_ENV
+
modified.github/workflows/xcm.ymldiffbeforeafterboth
--- a/.github/workflows/xcm.yml
+++ b/.github/workflows/xcm.yml
@@ -284,25 +284,16 @@
             fi
         shell: bash
 
-
-      - name: Run find-and-replace to remove slashes from branch name
-        uses: mad9000/actions-find-and-replace-string@4
-        id: branchname
-        with:
-          source: ${{ github.head_ref }}
-          find: '/'
-          replace: '-'
-
       - name: Build unique-chain
         run: |
           docker build --file .docker/Dockerfile-unique \
             --build-arg RUNTIME_FEATURES=${{ matrix.runtime_features }} \
             --build-arg RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }} \
-            --tag uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-${{ env.BUILD_SHA }} \
+            --tag uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ env.REF_SLUG }}-${{ env.BUILD_SHA }} \
             .
 
       - name: Push docker image version
-        run: docker push uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-${{ env.BUILD_SHA }}
+        run: docker push uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}
 
       - uses: actions/setup-node@v3.5.1
         with:
@@ -320,10 +311,12 @@
         with:
           jpath: |
             .baedeker/vendor
+          tla-str: |
+            relay_spec=rococo
           inputs: |
             .baedeker/xcm-${{ matrix.network }}.jsonnet
             snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/polkadot':{dockerImage:'uniquenetwork/builder-polkadot:${{ matrix.relay_branch }}'}})
-            snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/unique':{dockerImage:'uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ steps.branchname.outputs.value }}-${{ env.BUILD_SHA }}'}})
+            snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/unique':{dockerImage:'uniquenetwork/ci-xcm-local:${{ matrix.network }}-${{ env.REF_SLUG }}-${{ env.BUILD_SHA }}'}})
             snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/acala':{dockerImage:'uniquenetwork/builder-acala:${{ matrix.acala_version }}'}})
             snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/moonbeam':{dockerImage:'uniquenetwork/builder-moonbeam:${{ matrix.moonbeam_version }}'}})
             snippet:(import 'baedeker-library/ops/rewrites.libsonnet').rewriteNodePaths({'bin/cumulus':{dockerImage:'uniquenetwork/builder-cumulus:${{ matrix.cumulus_version }}'}})