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

Bump to Java17 for GHA runner #31762

Closed
wants to merge 3 commits into from
Closed

Bump to Java17 for GHA runner #31762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e75fdef
Bump to Java17 for GHA runner
Abacn Jul 3, 2024
e4e9b2b
Bump default gradle to 8.4
Abacn Jul 3, 2024
f910375
Remove explicit ref to java8 in GHA; bump default GHA java version to 17
Abacn Jul 3, 2024
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
2 changes: 1 addition & 1 deletion .github/actions/setup-environment-action/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
16 changes: 8 additions & 8 deletions .github/gh-actions-self-hosted-runners/arc/images/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ 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 && \
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 && \
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/beam_PostCommit_Java_ValidatesRunner_Dataflow_JavaVersions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/beam_PostCommit_Java_ValidatesRunner_Direct_JavaVersions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/beam_PostCommit_Java_ValidatesRunner_Flink_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading