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

SRVLOGIC-202: Schedule apache-main sync from upstream #3

Conversation

fantonangeli
Copy link

@fantonangeli fantonangeli commented Dec 20, 2023

Jira:
https://issues.redhat.com/browse/SRVLOGIC-202

IMPORTANT:
Please read the jira comments.

Description of the change:
Set up a GitHub Action to sync our midstream main-apache branch with the upstream main branch every day.

This workflow will run every day at midnight to merge upstream/main to origin/main-apache.
The repository used to test this workflow is fantonangeli/kogito-serverless-operator-fantonangeli-test:
https://github.com/fantonangeli/kogito-serverless-operator-fantonangeli-test/actions

Motivation for the change:
Keep our repository in sync with the upstream Apache repository.

Checklist

  • Add or Modify a unit test for your change
  • Have you verified that tall the tests are passing?
How to backport a pull request to a different branch?

In order to automatically create a backporting pull request please add one or more labels having the following format backport-<branch-name>, where <branch-name> is the name of the branch where the pull request must be backported to (e.g., backport-7.67.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.

If something goes wrong, the author will be notified and at this point a manual backporting is needed.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

@fantonangeli
Copy link
Author

Review request: @ricardozanini @rgdoliveira

Copy link
Member

@ricardozanini ricardozanini left a comment

Choose a reason for hiding this comment

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

Great work! LGTM!

Copy link
Member

@rgdoliveira rgdoliveira left a comment

Choose a reason for hiding this comment

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

I think it looks good too.

@fantonangeli @ricardozanini I suppose we can merge this one and see it working and after that @fantonangeli can open this PR to the other repositories, WDYT?

@fantonangeli
Copy link
Author

@ricardozanini @rgdoliveira
Please note: to let the Sync CI run, we need to change the default branch to main

@rgdoliveira
Copy link
Member

@fantonangeli I guess you have permissions to change the default branch to main, right?
If so, you can go ahead and change the default branch to main in all repos.

@fantonangeli
Copy link
Author

@fantonangeli I guess you have permissions to change the default branch to main, right? If so, you can go ahead and change the default branch to main in all repos.

I confirm I have the permissions, I can do it right now

Copy link
Member

@rgdoliveira rgdoliveira left a comment

Choose a reason for hiding this comment

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

LGTM

@fantonangeli
Copy link
Author

@fantonangeli I guess you have permissions to change the default branch to main, right? If so, you can go ahead and change the default branch to main in all repos.

I confirm I have the permissions, I can do it right now
@rgdoliveira
Ooops, I thought I had the permissions as per other repositories, but for this specific one, I cannot change the default branch. Can you please help?

@rgdoliveira
Copy link
Member

Ooops, I thought I had the permissions as per other repositories, but for this specific one, I cannot change the default branch. Can you please help?

Done.

@ricardozanini ricardozanini merged commit 96f4cee into kiegroup:main Jan 26, 2024
3 of 4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants