Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ runs:
- uses: actions/setup-java@v3
if: ${{ inputs.java-version != '' }}
with:
distribution: 'zulu'
distribution: 'temurin' # use same JDK distro as in Trino docker images
java-version: ${{ inputs.java-version }}
- name: Cache local Maven repo
id: cache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
distribution: 'temurin' # use same JDK distro as in Trino docker images
java-version: 17
cache: 'maven'
- name: Configure Problem Matchers
Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
fetch-depth: 0 # checkout all commits, as the build result depends on `git describe` equivalent
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
distribution: 'temurin' # use same JDK distro as in Trino docker images
java-version: 17
cache: 'maven'
- name: Configure Problem Matchers
Expand Down
1 change: 1 addition & 0 deletions core/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#
FROM ghcr.io/airlift/jvmkill:latest AS jvmkill

# Use Eclipse Temurin as they have base Docker images for more architectures.
FROM eclipse-temurin:17-jdk

RUN \
Expand Down