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.

Sign up for GitHub

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

Fix: upgrade 2.x CI to JDK-21 #1072

Merged
merged 2 commits into from
Jan 8, 2025
Merged

Fix: upgrade 2.x CI to JDK-21 #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74b5f13
upgrade JDK to 21 in CI
yuye-aws Jan 8, 2025
93f7e14
update change log
yuye-aws Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/CI.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [ubuntu-latest]

name: Gradle Check Linux
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
Check-neural-search-windows:
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [windows-latest]

name: Gradle Check Windows
Expand All @@ -82,7 +82,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [ubuntu-latest]

name: Pre-commit Linux
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
Precommit-neural-search-windows:
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [windows-latest]

name: Pre-commit Windows
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/backwards_compatibility_tests_workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
Restart-Upgrade-BWCTests-NeuralSearch:
strategy:
matrix:
java: [ 11, 17, 21 ]
java: [ 21 ]
os: [ubuntu-latest,windows-latest]
bwc_version : ["2.9.0","2.10.0","2.11.0","2.12.0","2.13.0","2.14.0","2.15.0","2.16.0","2.17.0","2.18.0"]
opensearch_version : [ "2.19.0-SNAPSHOT" ]
Expand All @@ -40,7 +40,7 @@ jobs:
Rolling-Upgrade-BWCTests-NeuralSearch:
strategy:
matrix:
java: [ 11, 17, 21 ]
java: [ 21 ]
os: [ubuntu-latest,windows-latest]
bwc_version: [ "2.11.0","2.12.0","2.13.0","2.14.0","2.15.0", "2.16.0", "2.17.0", "2.18.0" ]
opensearch_version: [ "2.19.0-SNAPSHOT" ]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_aggregations.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
needs: Get-CI-Image-Tag
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [ubuntu-latest]

name: Integ Tests Linux
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
Check-neural-search-windows:
strategy:
matrix:
java: [11, 17, 21]
java: [21]
os: [windows-latest]

name: Integ Tests Windows
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Fix bug where ingested document has list of nested objects ([#1040](https://github.com/opensearch-project/neural-search/pull/1040))
- Fixed document source and score field mismatch in sorted hybrid queries ([#1043](https://github.com/opensearch-project/neural-search/pull/1043))
### Infrastructure
- Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835))
Copy link
Contributor

Choose a reason for hiding this comment

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

Should it be #1072 ?

Copy link
Collaborator

Choose a reason for hiding this comment

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

The PR number in changelog should be the original one not the one with backport.

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- Fix CI for JDK upgrade towards 21 ([#835](https://github.com/opensearch-project/neural-search/pull/835))
- Fix CI for JDK upgrade towards 21 ([#1072](https://github.com/opensearch-project/neural-search/pull/1072))

### Documentation
### Maintenance
### Refactoring
Loading