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

workflows/openshift-os allow custom branches #2880

Merged

Conversation

jbtrystram
Copy link
Contributor

Allow specifying the source branch to open a PR from
as well as the target branch to compare against.
This is useful for backporting work

Also update the action as there were some deprecation warnings

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

My 2c is to rework this to use a choice input instead. 3 inputs is a lot to get right (esp. the branch-name one; forgetting to update that one would stomp on an open PR opened against a completely different branch -- though maybe the create-pull-request action would error out on that).

.github/workflows/openshift-os.yml Outdated Show resolved Hide resolved
.github/workflows/openshift-os.yml Show resolved Hide resolved
@jbtrystram jbtrystram force-pushed the bump_job_custom_branches_fixup branch from 60db0a4 to dc6ef4b Compare February 28, 2024 10:47
@jbtrystram
Copy link
Contributor Author

Ok, here is a working version of the workflow :)

Successful run (on my fork to avoid noise on openshift/os ) : https://github.com/jbtrystram/fedora-coreos-config/actions/runs/8081693445/job/22080845871
Created PR : (here backporting 4.15 release) -> jbtrystram/openshift-os#1

@jbtrystram jbtrystram force-pushed the bump_job_custom_branches_fixup branch from dc6ef4b to dff6a67 Compare February 28, 2024 14:24
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

This looks great!

.github/workflows/openshift-os.yml Outdated Show resolved Hide resolved
.github/workflows/openshift-os.yml Outdated Show resolved Hide resolved
.github/workflows/openshift-os.yml Show resolved Hide resolved
the base branch should be checked out initally otherwise the rebase will
fails.
Also fixup the log generation to remove the hard-coded testing-devel
Make the sources branches to a pickup menu and generate the destination
branch and the base PR branch from that to avoid errors.
@jbtrystram jbtrystram force-pushed the bump_job_custom_branches_fixup branch from 8565000 to 951311c Compare February 29, 2024 12:22
@jbtrystram jbtrystram merged commit 1909aa9 into coreos:testing-devel Feb 29, 2024
3 checks passed
@jbtrystram jbtrystram deleted the bump_job_custom_branches_fixup branch February 29, 2024 14:11
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.

2 participants