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

[18.0-fr1][make]Add force-bump target to bump operator deps #508

Merged

Conversation

gibizer
Copy link
Contributor

@gibizer gibizer commented Nov 25, 2024

The new force-bump target bumps operator and lib-common dependencies of this operator by tracking the same branch from these dependencies.

18.0-fr1 only change:

  • resolve the merge conflict in Makefile due to 20ea95d is not in 18.0-fr1
  • switched the branch target of force-bump to 18.0-fr1

Related: OSPRH-8355
(cherry picked from commit 446790d)

The new force-bump target bumps operator and lib-common dependencies of
this operator by tracking the same branch from these dependencies.

18.0-fr1 only change:

* resolve the merge conflict in Makefile due to 20ea95d is not in 18.0-fr1
* switched the branch target of force-bump to 18.0-fr1

Related: OSPRH-8355
(cherry picked from commit 446790d)
@gibizer
Copy link
Contributor Author

gibizer commented Nov 25, 2024

/hold #507 is needed first

@gibizer
Copy link
Contributor Author

gibizer commented Nov 26, 2024

/unhold
#507 landed

Copy link
Contributor

@stuggi stuggi left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link
Contributor

openshift-ci bot commented Nov 26, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gibizer, stuggi

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-bot openshift-merge-bot bot merged commit 8c4775d into openstack-k8s-operators:18.0-fr1 Nov 26, 2024
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants