Skip to content

Excluding AKISerialNumber test on JDK8 until fix is merged #5215

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

Merged
merged 1 commit into from
Apr 13, 2024

Conversation

adamfarley
Copy link
Contributor

This fix is in the dev branch, but is not yet merged into the master branch. This fix will likely be merged shortly after the April 2024 release.

This fix is in the dev branch, but is not yet merged into
the master branch. This fix will likely be merged shortly after
the April 2024 release.

Signed-off-by: Adam Farley <[email protected]>
@smlambert
Copy link
Contributor

This fix is in the dev branch, but is not yet merged into the master branch. This fix will likely be merged shortly after the April 2024 release.

For awareness, typically we merge into master then cherrypick the commit to the release branch. There would be no delay in merging into master, as we do not code freeze AQAvit repos, since we tag and branch, development is not blocked/frozen during release periods.

@adamfarley
Copy link
Contributor Author

Ah, that makes sense. Thanks for explaining. 😃

@adamfarley
Copy link
Contributor Author

In this instance then, should I cherry pick in the other direction and open a new PR so the commit ID is the same?

@smlambert
Copy link
Contributor

In this instance then, should I cherry pick in the other direction and open a new PR so the commit ID is the same?

No, in this instance, I have already merged your PR to the release branch. We will proceed to merge this PR to master once it gets a second approval.

I mentioned it for awareness going forward for future PRs.

And, we do not always want to / need to cherrypick commits to the release branch even though it makes sense to commit it to the master branch.

@karianna karianna merged commit 27e4c1a into adoptium:master Apr 13, 2024
2 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