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
--- a/.baedeker/xcm-quartz.jsonnet
+++ b/.baedeker/xcm-quartz.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 [
@@ -113,7 +115,6 @@
 		[name]: {
 			bin: $.bin,
 			wantedKeys: 'para',
-			legacyRpc: true,
 		},
 		for name in ['alice', 'bob']
 	},
modified.baedeker/xcm-unique.jsonnetdiffbeforeafterboth
before · .baedeker/xcm-unique.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				['unique', 'acala'],15				['unique', 'moonbeam'],16				['unique', 'statemint'],17				['unique', 'astar'],18				['unique', 'polkadex'],19			]20		])),21	}},22	nodes: {23		[name]: {24			bin: $.bin,25			wantedKeys: 'relay',26		},27		for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory']28	},29};3031local unique = {32	name: 'unique',33	bin: 'bin/unique',34	paraId: 1001,35	spec: {Genesis:{36		modify:: m.genericPara($),37	}},38	nodes: {39		[name]: {40			bin: $.bin,41			wantedKeys: 'para',42		},43		for name in ['alice', 'bob']44	},45};4647local acala = {48	name: 'acala',49	bin: 'bin/acala',50	paraId: 1002,51	spec: {Genesis:{52		chain: 'acala-dev',53		modify:: bdk.mixer([54			m.genericPara($),55			function(prev) prev {id+: '-local'},56		]),57	}},58	nodes: {59		[name]: {60			bin: $.bin,61			wantedKeys: 'para',62			legacyRpc: true,63		},64		for name in ['alice', 'bob']65	},66};6768local moonbeam = {69	name: 'moonbeam',70	bin: 'bin/moonbeam',71	signatureSchema: 'Ethereum',72	paraId: 1003,73	spec: {Genesis:{74		chain: 'moonbeam-local',75		specFilePrefix: 'moonbeam-local-',76		modify:: m.genericPara($),77	}},78	nodes: {79		[name]: {80			bin: $.bin,81			wantedKeys: 'para-nimbus',82			legacyRpc: true,83		},84		for name in ['alice', 'bob']85	},86};8788local statemint = {89	name: 'statemint',90	bin: 'bin/cumulus',91	paraId: 1004,92	spec: {Genesis:{93		chain: 'statemint-local',94		modify:: m.genericPara($),95	}},96	nodes: {97		[name]: {98			bin: $.bin,99			wantedKeys: 'para-ed',100		},101		for name in ['alice', 'bob']102	},103};104105local astar = {106	name: 'astar',107	bin: 'bin/astar',108	paraId: 1005,109	spec: {Genesis:{110		chain: 'astar-dev',111		modify:: m.genericPara($),112	}},113	nodes: {114		[name]: {115			bin: $.bin,116			wantedKeys: 'para',117			legacyRpc: true,118		},119		for name in ['alice', 'bob']120	},121};122123local polkadex = {124	name: 'polkadex',125	bin: 'bin/polkadex',126	paraId: 1006,127	spec: {Genesis:{128		chain: 'mainnet',129		modify:: m.genericPara($),130	}},131	nodes: {132		[name]: {133			bin: $.bin,134			wantedKeys: 'para',135		},136		for name in ['alice', 'bob']137	},138};139140relay + {141	parachains: {142		[para.name]: para,143		for para in [unique, acala, moonbeam, statemint, astar, polkadex]144	},145}
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 }}'}})