From e75fdefdad9c2d73c64b5c83bfb8517aaee97c87 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Wed, 3 Jul 2024 11:56:56 -0400 Subject: [PATCH 1/3] Bump to Java17 for GHA runner --- .../gh-actions-self-hosted-runners/arc/images/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile index 7fa8f631729ce..fdf103a2f2116 100644 --- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile +++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile @@ -37,10 +37,10 @@ RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \ rm go${go_version}.linux-amd64.tar.gz ENV PATH="${PATH}:/usr/local/go/bin" #Install Java -RUN curl -OL https://cdn.azul.com/zulu/bin/zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \ - tar -C /usr/local -xzf zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \ - rm zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \ - mv /usr/local/zulu8.70.0.23-ca-jdk8.0.372-linux_x64 /usr/local/java +RUN curl -OL https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_x64.tar.gz && \ + tar -C /usr/local -xzf zulu17.50.19-ca-jdk17.0.11-linux_x64.tar.gz && \ + rm zulu17.50.19-ca-jdk17.0.11-linux_x64.tar.gz && \ + mv /usr/local/zulu17.50.19-ca-jdk17.0.11-linux_x64 /usr/local/java ENV PATH="${PATH}:/usr/local/java/bin" #Install Gradle RUN curl -OL https://services.gradle.org/distributions/gradle-7.3.3-bin.zip && \ From e4e9b2b98f10536412147fa71d09d755b42c7eee Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Wed, 3 Jul 2024 13:24:38 -0400 Subject: [PATCH 2/3] Bump default gradle to 8.4 --- .../gh-actions-self-hosted-runners/arc/images/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile index fdf103a2f2116..ad309d26c54d4 100644 --- a/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile +++ b/.github/gh-actions-self-hosted-runners/arc/images/Dockerfile @@ -43,10 +43,10 @@ RUN curl -OL https://cdn.azul.com/zulu/bin/zulu17.50.19-ca-jdk17.0.11-linux_x64. mv /usr/local/zulu17.50.19-ca-jdk17.0.11-linux_x64 /usr/local/java ENV PATH="${PATH}:/usr/local/java/bin" #Install Gradle -RUN curl -OL https://services.gradle.org/distributions/gradle-7.3.3-bin.zip && \ - unzip gradle-7.3.3-bin.zip && \ - rm gradle-7.3.3-bin.zip && \ - mv gradle-7.3.3 /usr/local/gradle +RUN curl -OL https://services.gradle.org/distributions/gradle-8.4-bin.zip && \ + unzip gradle-8.4-bin.zip && \ + rm gradle-8.4-bin.zip && \ + mv gradle-8.4 /usr/local/gradle ENV PATH="${PATH}:/usr/local/gradle/bin" #Install GitHub CLI RUN curl -OL https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz && \ From f9103755d035f650205a515ddc348d1615b807f7 Mon Sep 17 00:00:00 2001 From: Yi Hu Date: Wed, 3 Jul 2024 17:10:15 -0400 Subject: [PATCH 3/3] Remove explicit ref to java8 in GHA; bump default GHA java version to 17 --- .github/actions/setup-environment-action/action.yml | 2 +- ...m_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml | 3 +-- ...eam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml | 3 +-- .../beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml | 3 +-- .../beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/actions/setup-environment-action/action.yml b/.github/actions/setup-environment-action/action.yml index 912aca0e16f9d..56ed1115a2d15 100644 --- a/.github/actions/setup-environment-action/action.yml +++ b/.github/actions/setup-environment-action/action.yml @@ -48,7 +48,7 @@ runs: uses: actions/setup-java@v3 with: distribution: 'temurin' - java-version: ${{ inputs.java-version == 'default' && '8' || inputs.java-version }} + java-version: ${{ inputs.java-version == 'default' && '17' || inputs.java-version }} - name: Setup Gradle uses: gradle/gradle-build-action@v2 with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml index e4b7643bd2d80..6f15155a115cc 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml @@ -82,8 +82,7 @@ jobs: 8 - name: run jar Java${{ matrix.java_version }} script run: | - ./gradlew runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar \ - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 + ./gradlew runners:google-cloud-dataflow-java:testJar :runners:google-cloud-dataflow-java:worker:shadowJar - name: run validatesRunner Java${{ matrix.java_version }} script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml index 370a0698fd347..315e7499b55b9 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml @@ -82,8 +82,7 @@ jobs: 8 - name: run jar Java${{ matrix.java_version }} script run: | - ./gradlew :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar \ - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 + ./gradlew :runners:direct-java:shadowJar :runners:direct-java:shadowTestJar - name: run validatesRunner Java${{ matrix.java_version }} script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml index 9133b00218a37..cecd2146be5d5 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml @@ -80,8 +80,7 @@ jobs: 8 - name: run jar Java8 script run: | - ./gradlew :runners:flink:1.15:jar :runners:flink:1.15:testJar \ - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 + ./gradlew :runners:flink:1.15:jar :runners:flink:1.15:testJar - name: run validatesRunner Java11 script uses: ./.github/actions/gradle-command-self-hosted-action with: diff --git a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml index 40fc60fea6447..1d2f5798916be 100644 --- a/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml +++ b/.github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml @@ -80,8 +80,7 @@ jobs: 8 - name: run jar Java8 script run: | - ./gradlew :runners:spark:3:jar :runners:spark:3:testJar \ - -Dorg.gradle.java.home=$JAVA_HOME_8_X64 + ./gradlew :runners:spark:3:jar :runners:spark:3:testJar - name: run validatesRunner Java11 script uses: ./.github/actions/gradle-command-self-hosted-action with: