Skip to content
This repository has been archived by the owner on Jun 26, 2024. It is now read-only.

Add GH workflows for cherry-picking PRs to release branches #1217

Conversation

pmacik
Copy link
Contributor

@pmacik pmacik commented Sep 6, 2022

Changes

This PR adds GH workflows to automate release-branch cherry-picking process. It goes as follows - as soon as the release-labeled PR to master is merged:

  • A cherry-pick PR branch is created based on the release branch label of the original PR
  • Original PR commit from master is cherry-picked and added on top of the cherry-pick PR branch
  • A cherry-pick PR is sent from the cherry-pick PR branch to the release branch
  • Normal PR checking flow is excercised including all the CI and approval
  • Once the cherry-pick PR is merged the cherry-pick PR branch is deleted

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Docs
    included if any changes are user facing
  • Tests
    included if any functionality added or changed. For bugfixes please include tests that can catch regressions
  • All acceptance test scenarios included in the PR which verifies a bugfix or a requested feature reported by a non-member are tagged with @external-feedback tag.
  • Follows the commit message standard

@pmacik pmacik added release/v1.1.x Used to mark PRs to be cherry-picked in release-v1.1.x branch release/v1.2.x Used to mark PRs to be cherry-picked in release-v1.2.x branch labels Sep 6, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 6, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@github-actions github-actions bot added the acceptance-tests-skipped Marks PR that does not need to run the acceptance tests label Sep 6, 2022
@codecov
Copy link

codecov bot commented Sep 6, 2022

Codecov Report

Merging #1217 (1795e0c) into master (0535239) will not change coverage.
The diff coverage is n/a.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1217   +/-   ##
=======================================
  Coverage   58.06%   58.06%           
=======================================
  Files          33       33           
  Lines        2797     2797           
=======================================
  Hits         1624     1624           
  Misses       1018     1018           
  Partials      155      155           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0535239...1795e0c. Read the comment docs.

@pmacik pmacik force-pushed the gha-release-branches-cherry-pick branch from 674df41 to c0d94d0 Compare September 7, 2022 07:36
@pmacik pmacik marked this pull request as ready for review September 7, 2022 07:40
@pmacik pmacik added release/v1.1.x Used to mark PRs to be cherry-picked in release-v1.1.x branch release/v1.2.x Used to mark PRs to be cherry-picked in release-v1.2.x branch and removed release/v1.1.x Used to mark PRs to be cherry-picked in release-v1.1.x branch release/v1.2.x Used to mark PRs to be cherry-picked in release-v1.2.x branch labels Sep 7, 2022
@pmacik pmacik force-pushed the gha-release-branches-cherry-pick branch from c0d94d0 to 81a3c6b Compare September 19, 2022 09:12
@baijum
Copy link
Member

baijum commented Sep 20, 2022

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Sep 20, 2022
@pmacik pmacik added the release/v1.3.x Used to mark PRs to be cherry-picked in release-v1.3.x branch label Oct 7, 2022
@pmacik pmacik force-pushed the gha-release-branches-cherry-pick branch from 81a3c6b to 1795e0c Compare October 10, 2022 22:47
@openshift-ci openshift-ci bot removed the lgtm label Oct 10, 2022
Copy link
Contributor

@dperaza4dustbit dperaza4dustbit left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 12, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dperaza4dustbit

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 6cdb804 into redhat-developer:master Oct 12, 2022
service-binding-operator-bot pushed a commit to service-binding-operator-bot/service-binding-operator that referenced this pull request Oct 12, 2022
service-binding-operator-bot pushed a commit to service-binding-operator-bot/service-binding-operator that referenced this pull request Oct 12, 2022
service-binding-operator-bot pushed a commit to service-binding-operator-bot/service-binding-operator that referenced this pull request Oct 12, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
acceptance-tests-skipped Marks PR that does not need to run the acceptance tests approved lgtm release/v1.1.x Used to mark PRs to be cherry-picked in release-v1.1.x branch release/v1.2.x Used to mark PRs to be cherry-picked in release-v1.2.x branch release/v1.3.x Used to mark PRs to be cherry-picked in release-v1.3.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants