From ce633d7367c8ed02d9fa98d6ff96d61b7c6ae39b Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Fri, 6 Sep 2024 17:42:19 +0800 Subject: [PATCH] Bump JDK to 21 (#1384) (#1546) * fix: bump jdk Signed-off-by: SuZhou-Joe * fix: bump jdk Signed-off-by: SuZhou-Joe * fix: bump jdk Signed-off-by: SuZhou-Joe * fix: bump jdk Signed-off-by: SuZhou-Joe --------- Signed-off-by: SuZhou-Joe (cherry picked from commit e445a5207cd74a215d4a326766b1fc0f65455537) (cherry picked from commit 539ab440ee0c7a480ae4caa8369826f650c23f89) --- .github/actions/start-opensearch/action.yml | 2 +- .../cypress-workflow-bundle-snapshot-based-ci-groups.yml | 3 +++ .github/workflows/release-e2e-workflow-template-windows.yml | 2 +- .github/workflows/release-e2e-workflow-template.yml | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/actions/start-opensearch/action.yml b/.github/actions/start-opensearch/action.yml index 2425cc2b9..fdc326add 100644 --- a/.github/actions/start-opensearch/action.yml +++ b/.github/actions/start-opensearch/action.yml @@ -40,7 +40,7 @@ runs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 21 - name: Create temporary directory run: | diff --git a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml index 2e4f63190..7a1067bd2 100644 --- a/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml +++ b/.github/workflows/cypress-workflow-bundle-snapshot-based-ci-groups.yml @@ -7,6 +7,8 @@ on: - 'cypress/**/core-opensearch-dashboards/**' - 'cypress/utils/dashboards/**' - 'package.json' + - '.github/actions/start-opensearch/action.yml' + push: branches: ['**'] paths: @@ -14,6 +16,7 @@ on: - 'cypress/**/core-opensearch-dashboards/**' - 'cypress/utils/dashboards/**' - 'package.json' + - '.github/actions/start-opensearch/action.yml' env: CI_GROUPS: "1,2,3,4,5,6,7,8,9" diff --git a/.github/workflows/release-e2e-workflow-template-windows.yml b/.github/workflows/release-e2e-workflow-template-windows.yml index fd9bc1dc4..31e9a0022 100644 --- a/.github/workflows/release-e2e-workflow-template-windows.yml +++ b/.github/workflows/release-e2e-workflow-template-windows.yml @@ -30,7 +30,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 21 - name: Checkout cypress-test uses: actions/checkout@v2 with: diff --git a/.github/workflows/release-e2e-workflow-template.yml b/.github/workflows/release-e2e-workflow-template.yml index 2f2b62926..1d0e976d5 100644 --- a/.github/workflows/release-e2e-workflow-template.yml +++ b/.github/workflows/release-e2e-workflow-template.yml @@ -33,7 +33,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 14 + java-version: 21 - name: Checkout cypress-test uses: actions/checkout@v2 with: