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

Jump to bottom

GH-38439: [Java][CI] Use Eclipse Temurin for all Java CI linux jobs #38440

Merged
merged 1 commit into from
Nov 9, 2023
Merged

GH-38439: [Java][CI] Use Eclipse Temurin for all Java CI linux jobs #38440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 4 additions & 19 deletions .github/workflows/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,17 @@ env:

jobs:

debian:
name: ${{ matrix.title }}
ubuntu:
name: AMD64 Ubuntu 22.04 Java JDK ${{ matrix.jdk }} Maven ${{ matrix.maven }}
runs-on: ubuntu-latest
if: ${{ !contains(github.event.pull_request.title, 'WIP') }}
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
jdk: [8, 11, 17, 21]
include:
- jdk: 8
title: AMD64 Debian 9 Java JDK 8 Maven 3.5.4
maven: 3.5.4
image: debian-java
- jdk: 11
title: AMD64 Debian 9 Java JDK 11 Maven 3.6.2
maven: 3.6.2
image: debian-java
- jdk: 17
title: AMD64 Ubuntu 22.04 Java JDK 17 Maven 3.9.4
maven: 3.9.4
image: eclipse-java
- jdk: 21
title: AMD64 Ubuntu 22.04 Java JDK 21 Maven 3.9.4
maven: 3.9.4
image: eclipse-java
maven: [3.9.5]
image: [java]
env:
JDK: ${{ matrix.jdk }}
MAVEN: ${{ matrix.maven }}
Expand Down
27 changes: 7 additions & 20 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,10 @@ x-hierarchy:
- debian-go:
- debian-go-cgo
- debian-go-cgo-python
- debian-java
- debian-js
- eclipse-java
- fedora-cpp:
- fedora-python
- java
- python-sdist
- ubuntu-cpp:
- ubuntu-cpp-static
Expand Down Expand Up @@ -1676,14 +1675,14 @@ services:

################################ Java #######################################

debian-java:
java:
# Usage:
# docker-compose build debian-java
# docker-compose run debian-java
# docker-compose build java
# docker-compose run java
# Parameters:
# MAVEN: 3.5.4, 3.6.2
# JDK: 8, 11
image: ${ARCH}/maven:${MAVEN}-jdk-${JDK}
# MAVEN: 3.9.5
# JDK: 8, 11, 17, 21
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
shm_size: *shm-size
volumes: &java-volumes
- .:/arrow:delegated
Expand All @@ -1693,18 +1692,6 @@ services:
/arrow/ci/scripts/java_build.sh /arrow /build &&
/arrow/ci/scripts/java_test.sh /arrow /build"

eclipse-java:
# Usage:
# docker-compose build eclipse-java
# docker-compose run eclipse-java
# Parameters:
# MAVEN: 3.9.4
# JDK: 17, 21
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
shm_size: *shm-size
volumes: *java-volumes
command: *java-command

############################## Integration ##################################

conda-integration:
Expand Down
4 changes: 2 additions & 2 deletions docs/source/developers/java/building.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Docker compose
$ cd arrow/java
$ export JAVA_HOME=<absolute path to your java home>
$ java --version
$ docker-compose run debian-java
$ docker-compose run java

Archery
~~~~~~~
Expand All @@ -86,7 +86,7 @@ Archery
$ cd arrow/java
$ export JAVA_HOME=<absolute path to your java home>
$ java --version
$ archery docker run debian-java
$ archery docker run java

Building JNI Libraries (\*.dylib / \*.so / \*.dll)
--------------------------------------------------
Expand Down
Loading