Skip to content

Commit

Permalink
updated all forkflows to meet current requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
@BuddyGlas
BuddyGlas committed Dec 19, 2024
1 parent badf396 commit 5f2c621
Show file tree
Hide file tree
Showing 14 changed files with 104 additions and 1,011 deletions.
29 changes: 15 additions & 14 deletions .baedeker/collator-selection.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,28 @@ local relay = {
chain: relay_spec,
modify:: bdk.mixer([
m.genericRelay($),
{
genesis+: {
runtimeGenesis+: {
runtime+: {
configuration+: {
config+: {
async_backing_params+: {
m.simplifyGenesisName(),
{
_genesis+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
scheduling_lookahead:5,
max_validators_per_core:1,
minimum_backing_votes:1,
needed_approvals:1,
on_demand_cores:5,
validation_upgrade_cooldown: 200,
validation_upgrade_delay: 100,
minimum_validation_upgrade_delay: 15,
minimum_backing_votes: 2,
needed_approvals: 2,
scheduler_params+: {
lookahead: 1,
},
},
},
},
},
},
},
m.unsimplifyGenesisName(),
]),
}},
nodes: {
Expand Down
29 changes: 15 additions & 14 deletions .baedeker/external-runtime.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,28 @@ local relay = {
chain: relay_spec,
modify:: bdk.mixer([
m.genericRelay($),
{
genesis+: {
runtimeGenesis+: {
runtime+: {
configuration+: {
config+: {
async_backing_params+: {
m.simplifyGenesisName(),
{
_genesis+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
scheduling_lookahead:5,
max_validators_per_core:1,
minimum_backing_votes:1,
needed_approvals:1,
on_demand_cores:5,
validation_upgrade_cooldown: 200,
validation_upgrade_delay: 100,
minimum_validation_upgrade_delay: 15,
minimum_backing_votes: 2,
needed_approvals: 2,
scheduler_params+: {
lookahead: 1,
},
},
},
},
},
},
},
m.unsimplifyGenesisName(),
]),
}},
nodes: {
Expand Down
26 changes: 25 additions & 1 deletion .baedeker/forkless-data.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,31 @@ local relay = {
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: m.genericRelay($),
modify:: bdk.mixer([
m.genericRelay($),
m.simplifyGenesisName(),
{
_genesis+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
validation_upgrade_cooldown: 200,
validation_upgrade_delay: 100,
minimum_validation_upgrade_delay: 15,
minimum_backing_votes: 2,
needed_approvals: 2,
scheduler_params+: {
lookahead: 1,
},
},
},
},
},
m.unsimplifyGenesisName(),
]),
}},
nodes: {
[name]: {
Expand Down
35 changes: 16 additions & 19 deletions .baedeker/just-tests.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,32 +13,30 @@ local relay = {
chain: relay_spec,
modify:: bdk.mixer([
m.genericRelay($),
{
genesis+: {
runtimeGenesis+: {
runtime+: {
configuration+: {
config+: {
async_backing_params+: {
m.simplifyGenesisName(),
{
_genesis+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
scheduling_lookahead:5,
max_validators_per_core:1,
minimum_backing_votes:1,
needed_approvals:1,
on_demand_cores:5,
validation_upgrade_cooldown:400,
validation_upgrade_delay:200,
minimum_validation_upgrade_delay:10,
validation_upgrade_cooldown: 200,
validation_upgrade_delay: 100,
minimum_validation_upgrade_delay: 15,
minimum_backing_votes: 2,
needed_approvals: 2,
scheduler_params+: {
lookahead: 1,
},
},
},
},
},
},
},
m.unsimplifyGenesisName(),
]),
}},
}},
nodes: {
[name]: {
bin: $.bin,
Expand Down Expand Up @@ -94,7 +92,6 @@ local unique = {
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
'-laura=debug',
],
},
for name in ['alice', 'bob', 'charlie']
Expand Down
26 changes: 25 additions & 1 deletion .baedeker/node-only.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,31 @@ local relay = {
validatorIdAssignment: 'staking',
spec: {Genesis:{
chain: relay_spec,
modify:: m.genericRelay($),
modify:: bdk.mixer([
m.genericRelay($),
m.simplifyGenesisName(),
{
_genesis+: {
configuration+: {
config+: {
async_backing_params+: {
allowed_ancestry_len: 3,
max_candidate_depth: 4,
},
validation_upgrade_cooldown: 200,
validation_upgrade_delay: 100,
minimum_validation_upgrade_delay: 15,
minimum_backing_votes: 2,
needed_approvals: 2,
scheduler_params+: {
lookahead: 1,
},
},
},
},
},
m.unsimplifyGenesisName(),
]),
}},
nodes: {
[name]: {
Expand Down
1 change: 1 addition & 0 deletions .baedeker/xcm-opal.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ local unique = {
wantedKeys: 'para',
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
],
},
for name in ['alice', 'bob']
Expand Down
3 changes: 2 additions & 1 deletion .baedeker/xcm-quartz.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local relay = {
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly', 'iggy', 'john', 'kurt']
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']
},
};

Expand All @@ -43,6 +43,7 @@ local unique = {
wantedKeys: 'para',
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
],
},
for name in ['alice', 'bob']
Expand Down
3 changes: 2 additions & 1 deletion .baedeker/xcm-unique.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ local relay = {
wantedKeys: 'relay',
expectedDataPath: '/parity',
},
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie', 'gregory', 'holly', 'iggy', 'john', 'kurt', 'larry', 'mike', 'norman', 'osvald']
for name in ['alice', 'bob', 'charlie', 'dave', 'eve', 'ferdie']
},
};

Expand All @@ -44,6 +44,7 @@ local unique = {
wantedKeys: 'para',
extraArgs: [
'--increase-future-pool',
'--pool-type=fork-aware',
],
},
for name in ['alice', 'bob']
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/ci-develop.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,35 +41,11 @@ jobs:
uses: ./.github/workflows/collator-selection.yml
secrets: inherit

#### should be removed ####

forkless-update-data:
if: github.event.pull_request.draft == false && (contains(github.event.pull_request.labels.*.name, 'CI-forkless-data') || contains(github.event.pull_request.labels.*.name, 'CI-forkless-update-data'))
uses: ./.github/workflows/forkless-update-data.yml
secrets: inherit

forkless-update-no-data:
if: github.event.pull_request.draft == false && (contains(github.event.pull_request.labels.*.name, 'CI-forkless-no-data') || contains(github.event.pull_request.labels.*.name, 'CI-forkless-update-no-data'))
uses: ./.github/workflows/forkless-update-nodata.yml
secrets: inherit

node-only-update:
if: github.event.pull_request.draft == false && contains(github.event.pull_request.labels.*.name, 'CI-node-only-update')
uses: ./.github/workflows/node-only-update.yml
secrets: inherit

#### end ####

main-process:
if: github.event.pull_request.draft == false && (contains(github.event.pull_request.labels.*.name, 'CI-main-process') || contains(github.event.pull_request.labels.*.name, 'CI-main-process'))
uses: ./.github/workflows/main-process-update.yml
secrets: inherit

just-tests:
if: github.event.pull_request.draft == false && (contains(github.event.pull_request.labels.*.name, 'CI-just-tests') || contains(github.event.pull_request.labels.*.name, 'CI-just-tests'))
uses: ./.github/workflows/just-tests-without-update.yml
secrets: inherit

try-runtime:
if: github.event.pull_request.draft == false && (contains(github.event.pull_request.labels.*.name, 'CI-try-runtime') || contains(github.event.pull_request.labels.*.name, 'CI-try-runtime'))
uses: ./.github/workflows/try-runtime.yml
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/ci-master.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,14 @@ jobs:
uses: ./.github/workflows/collator-selection.yml
secrets: inherit

forkless-update-data:
uses: ./.github/workflows/forkless-update-data.yml
secrets: inherit # pass all secrets from initial workflow to nested

forkless-update-no-data:
uses: ./.github/workflows/forkless-update-nodata.yml
secrets: inherit # pass all secrets from initial workflow to nested
main-process:
uses: ./.github/workflows/main-process-update.yml
secrets: inherit

try-runtime:
uses: ./.github/workflows/try-runtime.yml
secrets: inherit # pass all secrets from initial workflow to nested

node-only-update:
uses: ./.github/workflows/node-only-update.yml
secrets: inherit

governance:
uses: ./.github/workflows/governance.yml
secrets: inherit
Expand Down
Loading

0 comments on commit 5f2c621

Please sign in to comment.