From 420e4c19b1bd659bec71a7a0bc14ca391ff2532e Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Thu, 26 Jun 2025 10:39:30 -0400 Subject: [PATCH] Move to Java11 for GHA workflow still uses Java 8 --- .../beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml | 2 +- .../beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml | 2 +- .github/workflows/beam_PostCommit_Java_DataflowV1.yml | 4 +--- .../workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml | 2 +- .github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml | 2 +- .github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml | 2 +- .../beam_PostCommit_Python_ValidatesContainer_Dataflow.yml | 4 +--- ..._PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml | 4 +--- .../beam_PreCommit_Java_Examples_Dataflow_Java21.yml | 2 +- .github/workflows/beam_PreCommit_SQL_Java17.yml | 2 +- 10 files changed, 10 insertions(+), 16 deletions(-) diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml index 2dd206c5bae4..2a2486df032c 100644 --- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml +++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Batch_Java17.yml @@ -74,7 +74,7 @@ jobs: with: java-version: | 17 - 8 + 11 - name: Prepare test arguments uses: ./.github/actions/test-arguments-action with: diff --git a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml index eb405be32ddd..29576292b0ad 100644 --- a/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml +++ b/.github/workflows/beam_LoadTests_Java_GBK_Dataflow_V2_Streaming_Java17.yml @@ -74,7 +74,7 @@ jobs: with: java-version: | 17 - 8 + 11 - name: Prepare test arguments uses: ./.github/actions/test-arguments-action with: diff --git a/.github/workflows/beam_PostCommit_Java_DataflowV1.yml b/.github/workflows/beam_PostCommit_Java_DataflowV1.yml index dbd23d94367f..2d1c5f229cec 100644 --- a/.github/workflows/beam_PostCommit_Java_DataflowV1.yml +++ b/.github/workflows/beam_PostCommit_Java_DataflowV1.yml @@ -75,9 +75,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 11 - 8 + java-version: default - name: run PostCommit Java Dataflow V1 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml b/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml index cea8af594bf2..3d35a69cc7f8 100644 --- a/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml +++ b/.github/workflows/beam_PostCommit_Java_Jpms_Dataflow_Java17.yml @@ -75,7 +75,7 @@ jobs: with: java-version: | 17 - 8 + 11 - name: run PostCommit Java Jpms Dataflow Java17 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml index e149ff76eee7..7ff948a57a5e 100644 --- a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml +++ b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java17.yml @@ -75,7 +75,7 @@ jobs: with: java-version: | 17 - 8 + 11 - name: run PostCommit Java Jpms Direct Java17 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml index 68a47727f6f3..b4870b9d9fb9 100644 --- a/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml +++ b/.github/workflows/beam_PostCommit_Java_Jpms_Direct_Java21.yml @@ -76,7 +76,7 @@ jobs: distribution: 'temurin' java-version: | 21 - 8 + 11 - name: run PostCommit Java Jpms Direct Java21 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml index 9077803aeb07..9d280b751fd7 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow.yml @@ -77,9 +77,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 11 - 8 + java-version: default python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean diff --git a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml index 985c2a705fbb..d0f573f3b56c 100644 --- a/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml +++ b/.github/workflows/beam_PostCommit_Python_ValidatesContainer_Dataflow_With_RC.yml @@ -77,9 +77,7 @@ jobs: - name: Setup environment uses: ./.github/actions/setup-environment-action with: - java-version: | - 11 - 8 + java-version: default python-version: ${{ matrix.python_version }} - name: Set PY_VER_CLEAN id: set_py_ver_clean diff --git a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml index f1a1452887b6..fe8efc3ac344 100644 --- a/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml +++ b/.github/workflows/beam_PreCommit_Java_Examples_Dataflow_Java21.yml @@ -100,7 +100,7 @@ jobs: with: java-version: | 21 - 8 + 11 - name: Clean uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PreCommit_SQL_Java17.yml b/.github/workflows/beam_PreCommit_SQL_Java17.yml index 8deefa08fa4d..2ff54aad6355 100644 --- a/.github/workflows/beam_PreCommit_SQL_Java17.yml +++ b/.github/workflows/beam_PreCommit_SQL_Java17.yml @@ -85,7 +85,7 @@ jobs: with: java-version: | 17 - 8 + 11 python-version: default - name: Build and Test uses: ./.github/actions/gradle-command-self-hosted-action