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

Keep main branch version ahead of release branches #289

Merged
merged 1 commit into from
Jun 27, 2023

Conversation

lsm5
Copy link
Member

@lsm5 lsm5 commented Jun 15, 2023

Use -dev to denote development branch.

LIBPOD_URL in poodman/tests/__init__.py doesn't work with -dev, so
we only use vX.Y.Z.

@lsm5
Copy link
Member Author

lsm5 commented Jun 15, 2023

I'm cleaning up packit stuff in #288 and noticed main version is older than what's released.

@lsm5
Copy link
Member Author

lsm5 commented Jun 15, 2023

I'm cleaning up packit stuff in #288 and noticed main version is older than what's released.

hmm, maybe it's better to get #288 in first.

@rhatdan
Copy link
Member

rhatdan commented Jun 20, 2023

@lsm5 does this need a rebase?

@lsm5
Copy link
Member Author

lsm5 commented Jun 20, 2023

@lsm5 does this need a rebase?

yes it does. I'll do it now.

@rhatdan
Copy link
Member

rhatdan commented Jun 20, 2023

@lsm5 Still a draft?

@lsm5
Copy link
Member Author

lsm5 commented Jun 21, 2023

@lsm5 Still a draft?

I'll remove draft status once builds pass.

@lsm5 lsm5 marked this pull request as ready for review June 21, 2023 12:42
@lsm5
Copy link
Member Author

lsm5 commented Jun 21, 2023

@umohnani8 @rhatdan Ready to go

@rhatdan
Copy link
Member

rhatdan commented Jun 21, 2023

LGTM

@umohnani8
Copy link
Member

I think let's add -dev to the version here so that when we actually want to cut 4.6 we can remove the -dev and cut from that commit. Keeping it at 4.6 right will be a bit confusing in the commit history when we finally cut and release 4.6.
Once we cut 4.6, we will create a release-4.6 branch for any backport and future 4.6.y releases and the main branch can then be bumped to 4.7-dev.
@lsm5 @rhatdan wdyt?

@lsm5
Copy link
Member Author

lsm5 commented Jun 21, 2023

I think let's add -dev to the version here so that when we actually want to cut 4.6 we can remove the -dev and cut from that commit. Keeping it at 4.6 right will be a bit confusing in the commit history when we finally cut and release 4.6. Once we cut 4.6, we will create a release-4.6 branch for any backport and future 4.6.y releases and the main branch can then be bumped to 4.7-dev. @lsm5 @rhatdan wdyt?

works for me. I can add that to the PR and we'll see what blows up :)

@rhatdan
Copy link
Member

rhatdan commented Jun 26, 2023

@lsm5 Reminder

@lsm5
Copy link
Member Author

lsm5 commented Jun 26, 2023

argh, got distracted. Let me fix this one.

@lsm5 lsm5 force-pushed the main-bump branch 2 times, most recently from 45bdf33 to 9a92df7 Compare June 27, 2023 14:40
@lsm5
Copy link
Member Author

lsm5 commented Jun 27, 2023

@umohnani8 @rhatdan ping any idea whatsup with the test:

E       requests_mock.exceptions.NoMockAddress: No mock address: GET http://%2frun%2fapi.sock/v4.6.0/libpod/containers/json

Is it that - character doesn't work here, so it's not taking -dev ?

@lsm5
Copy link
Member Author

lsm5 commented Jun 27, 2023

@umohnani8 @rhatdan Looks like LIBPOD_URL in podman/tests/__init__.py needs to be v4.6.0 and nothing else. v4.6.0-dev doesn't work. If that's ok, I'll squash commits, then we can merge this.

@lsm5
Copy link
Member Author

lsm5 commented Jun 27, 2023

Also, I think sometime ago there was some blocker that prevented us from specifying the version only once. Has that issue been revisited?

Use `-dev` to denote development branch.

`LIBPOD_URL` in `poodman/tests/__init__.py` doesn't work with `-dev`, so
we only use `vX.Y.Z`.

Signed-off-by: Lokesh Mandvekar <[email protected]>
@lsm5
Copy link
Member Author

lsm5 commented Jun 27, 2023

Squashed commits. Also updated commit message. PTAL

@rhatdan
Copy link
Member

rhatdan commented Jun 27, 2023

/approve
/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 27, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, rhatdan

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 b0d4a21 into containers:main Jun 27, 2023
@lsm5 lsm5 deleted the main-bump branch June 28, 2023 12:55
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.

4 participants