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

Update CI to test on JDK 21 #267

Merged
merged 1 commit into from
Dec 15, 2023
Merged

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Dec 9, 2023

Description

Switches testing from JDK 20 (EOL) to JDK 21 (LTS)

Matches OpenSearch JDK testing: https://github.com/opensearch-project/OpenSearch/blob/3c14cc187525fde6cc24fd5e3acec18c44ce9a1d/.github/workflows/precommit.yml#L10

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Daniel Widdis <[email protected]>
@github-actions github-actions bot added the backport 2.x backport PRs to 2.x branch label Dec 9, 2023
@dbwiddis dbwiddis merged commit 287f480 into opensearch-project:main Dec 15, 2023
20 checks passed
@dbwiddis dbwiddis deleted the jdk-21 branch December 15, 2023 00:31
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-267-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 287f48090000bb5d8daa1a7d8c5ed2fbc365fd35
# Push it to GitHub
git push --set-upstream origin backport/backport-267-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-267-to-2.x.

@dbwiddis
Copy link
Member Author

To backport manually, run these commands in your terminal:

Intentionally not backporting; we were only running on JDK11 so the 20->21 change doesn't apply

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants