Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: auto pick non-breaking changes #4498

Merged
merged 26 commits into from
Feb 14, 2024
Merged

feat: auto pick non-breaking changes #4498

merged 26 commits into from
Feb 14, 2024

Conversation

tomjohnburton
Copy link
Contributor

@tomjohnburton tomjohnburton commented Feb 7, 2024

This will allow developers to add the non-breaking label to their PR which will automatically add the resulting merged commit to the latest release branch and assign @martin-chainflip as a reviewer

Copy link

codecov bot commented Feb 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0e73474) 73% compared to head (2b09599) 72%.
Report is 8 commits behind head on main.

Additional details and impacted files
@@          Coverage Diff           @@
##            main   #4498    +/-   ##
======================================
- Coverage     73%     72%    -0%     
======================================
  Files        397     399     +2     
  Lines      67876   67787    -89     
  Branches   67876   67787    -89     
======================================
- Hits       49336   49122   -214     
- Misses     15916   16009    +93     
- Partials    2624    2656    +32     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@tomjohnburton tomjohnburton changed the title chore: auto pick chore: auto pick [pick] Feb 9, 2024
@tomjohnburton tomjohnburton requested review from dandanlen, martin-chainflip and kylezs and removed request for dandanlen February 9, 2024 13:03
Copy link
Collaborator

@dandanlen dandanlen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we make it a label instead of having to edit the commit message? Having the information in the commit message seems a bit unnecessary... It will appear in (by default) in changelogs etc.

@tomjohnburton tomjohnburton changed the title chore: auto pick [pick] chore: auto pick non-breaking changes Feb 13, 2024
@tomjohnburton tomjohnburton changed the title chore: auto pick non-breaking changes feat: auto pick non-breaking changes Feb 13, 2024
@tomjohnburton
Copy link
Contributor Author

tomjohnburton commented Feb 13, 2024

Done

Can we make it a label instead of having to edit the commit message? Having the information in the commit message seems a bit unnecessary... It will appear in (by default) in changelogs etc.

Updated as requested

@tomjohnburton tomjohnburton added the non-breaking Merging this PR will create a cherry-pick onto release label Feb 13, 2024
@tomjohnburton tomjohnburton merged commit 5894480 into main Feb 14, 2024
43 checks passed
@tomjohnburton tomjohnburton deleted the pla-1142 branch February 14, 2024 10:00
github-actions bot pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main

(cherry picked from commit 5894480)
github-actions bot pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main

(cherry picked from commit 5894480)
github-actions bot pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main

(cherry picked from commit 5894480)
dandanlen pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main
github-actions bot pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main

(cherry picked from commit 5894480)
chainflip-bot pushed a commit that referenced this pull request Feb 14, 2024
* chore: auto pick

* fix: correct env

* change (#4499)

* change (#4501)

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* [pick]

* fix: correct namespace

* chore: add notification

* chore: use PR and labels

* fix: revert to pr closed

* fix: do with ref

* fake (#4522)

* fake (#4524)

* chore: add commit sha

* chore: remove pla-14432

* chore: improve readme

* fix: remove comment

* fix: set base commit as main

(cherry picked from commit 5894480)
syan095 added a commit that referenced this pull request Feb 16, 2024
…igned-error

* origin/main:
  chore: fetch solana state from docker (#4538)
  feat: charge a fee for opening swap deposit addresses (#4512)
  refactor: Remove RpcAsset (PRO-1187) (#4491)
  fix: re-add version update (#4533)
  fix: pull first (#4526)
  feat: auto pick non-breaking changes (#4498)

# Conflicts:
#	state-chain/pallets/cf-ingress-egress/src/lib.rs
#	state-chain/pallets/cf-ingress-egress/src/tests.rs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
non-breaking Merging this PR will create a cherry-pick onto release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants