Skip to content

Commit

Permalink
Fix building of OpenSearch 3.0.0-SNAPSHOT/main by installing JDK 21 (#…
Browse files Browse the repository at this point in the history
…694)

Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit 8c05271)
  • Loading branch information
Xtansia authored and github-actions[bot] committed Jul 8, 2024
1 parent f705c46 commit 411832a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .github/actions/start-opensearch/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,14 @@ outputs:
runs:
using: composite
steps:
- name: Install Java
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 11

- name: Start OpenSearch
id: opensearch
shell: bash -eo pipefail {0}
run: |
if [[ "$RUNNER_OS" == "macOS" ]]; then
brew install -q coreutils
fi
unset JAVA_HOME
OPENSEARCH_HOME=$(realpath ./opensearch-[1-9]*)
CONFIG_DIR=$OPENSEARCH_HOME/config
CONFIG_FILE=$CONFIG_DIR/opensearch.yml
Expand All @@ -48,7 +43,7 @@ runs:
SECURITY_MINOR="${SECURITY_VERSION_COMPONENTS[1]}"
if (( $SECURITY_MAJOR > 2 || ( $SECURITY_MAJOR == 2 && $SECURITY_MINOR >= 12 ) )); then
export OPENSEARCH_INITIAL_ADMIN_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 16)
export OPENSEARCH_INITIAL_ADMIN_PASSWORD="myStrongPassword123!"
fi
bash "$SECURITY_DIR/tools/install_demo_configuration.sh" -y -i -s
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/integration-yaml-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ jobs:
restore-keys: |
${{ runner.os }}-nuget-
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 21
distribution: 'temurin'

- name: Restore or Build OpenSearch
id: opensearch_build
uses: ./client/.github/actions/build-opensearch
Expand Down

0 comments on commit 411832a

Please sign in to comment.