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

CI: Prevent breaking backports #4812

Merged
merged 9 commits into from
Jul 26, 2024
Merged

CI: Prevent breaking backports #4812

merged 9 commits into from
Jul 26, 2024

Conversation

ggwpez
Copy link
Member

@ggwpez ggwpez commented Jun 17, 2024

  • Prevent major changes to be merged into a stable branch.
  • Place a comment on backport MRs to provide context of what it means.

Comment looks like this:

Screenshot 2024-07-24 at 17 36 35

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez ggwpez requested review from a team as code owners June 17, 2024 22:33
@ggwpez ggwpez mentioned this pull request Jun 27, 2024
3 tasks
Comment on lines +49 to +51
wget -q https://github.com/cli/cli/releases/download/v2.51.0/gh_2.51.0_linux_amd64.tar.gz -O gh.tar.gz && \
tar -xzf gh.tar.gz && mv gh_2.51.0_linux_amd64/bin/gh /usr/local/bin/gh && rm gh.tar.gz
chmod +x /usr/local/bin/gh
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

@ggwpez ggwpez Jul 24, 2024

Choose a reason for hiding this comment

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

I tried it, but this and similar actions dont allow to simply edit the last comment. The gh cli has a --edit-last flag to avoid spam in the merge request that just amends it.
Alternative is to use the gh API and figure out the last comment id, and then editing that id. Surely more difficult than this one command.

@ggwpez ggwpez added the R0-silent Changes should not be mentioned in any release notes label Jul 24, 2024
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
@ggwpez ggwpez requested a review from Morganamilo July 25, 2024 11:08
@paritytech-review-bot paritytech-review-bot bot requested a review from a team July 25, 2024 12:41
@ggwpez ggwpez enabled auto-merge July 25, 2024 12:43
@ggwpez ggwpez added this pull request to the merge queue Jul 26, 2024
Merged via the queue into master with commit 0d7d217 Jul 26, 2024
158 of 160 checks passed
@ggwpez ggwpez deleted the oty-ci-backport-check branch July 26, 2024 09:37
TarekkMA pushed a commit to moonbeam-foundation/polkadot-sdk that referenced this pull request Aug 2, 2024
- Prevent `major` changes to be merged into a `stable` branch.
- Place a comment on backport MRs to provide context of what it means.

Comment looks like this:

![Screenshot 2024-07-24 at 17 36
35](https://github.com/user-attachments/assets/6393549b-7b15-41e5-a804-8581c625ceff)

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
ggwpez added a commit that referenced this pull request Aug 5, 2024
Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
ggwpez added a commit that referenced this pull request Aug 6, 2024
Backport #4812 and #5189 to fix the CI.

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Morgan Adamiec <morgan@parity.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
R0-silent Changes should not be mentioned in any release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants