Skip to content

Adds workflow that fails CI check on purpose if a pull request target was deprecated branch#2145

Closed
DarshitChanpura wants to merge 1 commit intoopensearch-project:mainfrom
DarshitChanpura:protect-deprecated-branches
Closed

Adds workflow that fails CI check on purpose if a pull request target was deprecated branch#2145
DarshitChanpura wants to merge 1 commit intoopensearch-project:mainfrom
DarshitChanpura:protect-deprecated-branches

Conversation

@DarshitChanpura
Copy link
Member

@DarshitChanpura DarshitChanpura commented Oct 5, 2022

Description

This change adds a workflow that is built to fail on trigger. This workflow will only be triggered when a pull-request is opened against a deprecated branch mentioned in the workflow yaml, to prevent changes from going in.

  • Category: Maintenance
  • Why these changes are required?: This change will serve as a reminder for Maintainers to not merge PRs into deprecated branches accidentally.

Testing

Manual testing
See opensearch-project/security-dashboards-plugin#1127 for details

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@DarshitChanpura DarshitChanpura requested a review from a team October 5, 2022 19:13
@DarshitChanpura DarshitChanpura force-pushed the protect-deprecated-branches branch from b9ade93 to 0baeced Compare October 5, 2022 19:24
Copy link
Contributor

@stephen-crawford stephen-crawford left a comment

Choose a reason for hiding this comment

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

Looks good!

@DarshitChanpura DarshitChanpura added backport 1.x backport to 1.x branch backport 1.2 backport to 1.2 branch backport 1.3 backport to 1.3 branch backport 1.1 backport to 1.1 branch backport 1.0 backport to 1.0 branch backport 2.0 backport to 2.0 branch backport 2.x backport 2.1 backport 2.2 backport to 2.2 backport 2.3 backport to 2.3 branch labels Oct 5, 2022
peternied
peternied previously approved these changes Oct 5, 2022
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Nicely done! This is a really clean way to protect our branches

branches:
- '1.0'
- '1.1'
- '1.2'
Copy link
Member

Choose a reason for hiding this comment

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

Can we add 2.0, 2.1, 2.2?

Copy link
Member

Choose a reason for hiding this comment

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

Also 1.x

Copy link
Member

Choose a reason for hiding this comment

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

What about 2.3? Is this going to be a new step on every release to append to this list?

Copy link
Member

Choose a reason for hiding this comment

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

2.3 can still get patch releases, only after 2.4 ships would we add this block

@peternied
Copy link
Member

This looks like a viable solution to #2025

…ated branch

Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
@DarshitChanpura DarshitChanpura force-pushed the protect-deprecated-branches branch from 0baeced to d3fe71d Compare October 6, 2022 15:11
Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Until we have alignment on open issues on opensearch-project/security-dashboards-plugin#1127 and this PR lets not merge

@davidlago
Copy link

Closing after clarifying the back-porting policy here

@davidlago davidlago closed this Oct 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.x backport to 1.x branch backport 1.0 backport to 1.0 branch backport 1.1 backport to 1.1 branch backport 1.2 backport to 1.2 branch backport 1.3 backport to 1.3 branch backport 2.0 backport to 2.0 branch backport 2.1 backport 2.2 backport to 2.2 backport 2.3 backport to 2.3 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants