Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

companion for 14754: cli: move no-beefy flag to sc-cli#7600

Merged
acatangiu merged 2 commits into
paritytech:masterfrom
acatangiu:companion-sc-cli-beefy-flag
Aug 11, 2023
Merged

companion for 14754: cli: move no-beefy flag to sc-cli#7600
acatangiu merged 2 commits into
paritytech:masterfrom
acatangiu:companion-sc-cli-beefy-flag

Conversation

@acatangiu

@acatangiu acatangiu commented Aug 11, 2023

Copy link
Copy Markdown
Contributor

BEEFY is soon expected to run on all substrate-based chains.

Move --no-beefy flag from polkadot specific cli to sc-cli.

Companion for paritytech/substrate#14754

@acatangiu
cli: move no-beefy flag to substrate sc-cli config
2b35f10 
Signed-off-by: Adrian Catangiu <adrian@parity.io>
@acatangiu acatangiu added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. C1-low PR touches the given topic and has a low impact on builders. labels Aug 11, 2023
@acatangiu acatangiu self-assigned this Aug 11, 2023
@acatangiu acatangiu mentioned this pull request Aug 11, 2023
Merged
@acatangiu acatangiu requested review from andresilva and bkchr August 11, 2023 11:16
@paritytech-cicd-pr

paritytech-cicd-pr commented Aug 11, 2023

Copy link
Copy Markdown

The CI pipeline was cancelled due to failure one of the required jobs.
Job name: test-linux-stable
Logs: https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/3366035

@paritytech-processbot

paritytech-processbot Bot commented Aug 11, 2023

Copy link
Copy Markdown

Merge cancelled due to error. Error: Command 'Command { std: cd "/storage/repositories/polkadot" && "git" "push" "acatangiu" "companion-sc-cli-beefy-flag", kill_on_drop: false }' failed with status Some(1); output: To https://github.com/acatangiu/polkadot.git
! [remote rejected] companion-sc-cli-beefy-flag -> companion-sc-cli-beefy-flag (refusing to allow a GitHub App to create or update workflow .github/workflows/check-licenses.yml without workflows permission)
error: failed to push some refs to 'https://github.com/acatangiu/polkadot.git'

@acatangiu
bump substrate ref
2a64ca8 
Signed-off-by: Adrian Catangiu <adrian@parity.io>
@acatangiu

acatangiu commented Aug 11, 2023

Copy link
Copy Markdown
Contributor Author

bot merge

@paritytech-processbot

paritytech-processbot Bot commented Aug 11, 2023

Copy link
Copy Markdown

Error: Statuses failed for 2a64ca8

@acatangiu acatangiu merged commit 8f05479 into paritytech:master Aug 11, 2023
acatangiu added a commit to acatangiu/polkadot that referenced this pull request Aug 14, 2023
@acatangiu
Revert "companion for 14754: cli: move no-beefy flag to sc-cli (parit…
68500b5 
…ytech#7600)"

This reverts commit 8f05479.
acatangiu added a commit to acatangiu/polkadot that referenced this pull request Aug 14, 2023
@acatangiu
Revert "companion for 14754: cli: move no-beefy flag to sc-cli (parit…
10f1a95 
…ytech#7600)"

This reverts commit 8f05479.
paritytech-processbot Bot pushed a commit that referenced this pull request Aug 15, 2023
@acatangiu
Revert "companion for 14754: cli: move no-beefy flag to sc-cli (#7600)…
964330d 
…" (#7613)

* Revert "companion for 14754: cli: move no-beefy flag to sc-cli (#7600)"

This reverts commit 8f05479.

* update lockfile for {"substrate"}

* fix merge damage

---------

Co-authored-by: parity-processbot <>
s0me0ne-unkn0wn pushed a commit that referenced this pull request Aug 15, 2023
@acatangiu @s0me0ne-unkn0wn
companion for 14754: cli: move no-beefy flag to sc-cli (#7600)
12fdcba 
* cli: move no-beefy flag to substrate sc-cli config

* bump substrate ref

---------

Signed-off-by: Adrian Catangiu <adrian@parity.io>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@bkchr bkchr Awaiting requested review from bkchr

2 more reviewers

@andresilva andresilva andresilva approved these changes

@lexnv lexnv lexnv approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@acatangiu acatangiu

Labels

A0-please_review Pull request needs code review. A4-companion A PR that needs a companion PR to merge in parallel for one of its downstream dependencies. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@acatangiu @paritytech-cicd-pr @andresilva @lexnv