From 6b29b1b9715aea1fbb8c14733451ac41be194886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 30 Jun 2021 13:26:19 +0200 Subject: [PATCH 1/5] Increase JNI build's timeout --- .github/workflows/java_jni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index 7d7e26c75fe..b4cb5ac4ddf 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -50,7 +50,7 @@ jobs: name: AMD64 Debian 9 Java JNI (Gandiva, Plasma, ORC, Dataset) runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} - timeout-minutes: 40 + timeout-minutes: 60 strategy: fail-fast: false matrix: From d6efa3d9bb68b2c81b4b07d37041c17434c7eb00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 30 Jun 2021 16:02:46 +0200 Subject: [PATCH 2/5] 90m --- .github/workflows/java_jni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index b4cb5ac4ddf..58f76d01e40 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -50,7 +50,7 @@ jobs: name: AMD64 Debian 9 Java JNI (Gandiva, Plasma, ORC, Dataset) runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} - timeout-minutes: 60 + timeout-minutes: 90 strategy: fail-fast: false matrix: From ac717fc59c74eef63b4f34f4ad9dcf1698198241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Wed, 30 Jun 2021 22:59:46 +0200 Subject: [PATCH 3/5] 120m --- .github/workflows/java_jni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index 58f76d01e40..66ad3999a69 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -50,7 +50,7 @@ jobs: name: AMD64 Debian 9 Java JNI (Gandiva, Plasma, ORC, Dataset) runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} - timeout-minutes: 90 + timeout-minutes: 120 strategy: fail-fast: false matrix: From d154921909d48f99ad93007fa59e0ffec2e418a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 2 Jul 2021 12:09:46 +0200 Subject: [PATCH 4/5] Use the default build arguments from .env --- .github/workflows/java_jni.yml | 8 -------- docker-compose.yml | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index 66ad3999a69..9484e18ce59 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -51,14 +51,6 @@ jobs: runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} timeout-minutes: 120 - strategy: - fail-fast: false - matrix: - jdk: [8] - maven: [3.5.2] - env: - JDK: ${{ matrix.jdk }} - MAVEN: ${{ matrix.maven }} steps: - name: Checkout Arrow uses: actions/checkout@v2 diff --git a/docker-compose.yml b/docker-compose.yml index 79618a1cfed..03e2a0b0de8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1221,12 +1221,12 @@ services: # docker-compose build debian-java # docker-compose build debian-java-jni # docker-compose run debian-java-jni - image: ${REPO}:${ARCH}-debian-9-java-jni + image: ${REPO}:${ARCH}-debian-9-java-${JDK}-maven-${MAVEN}-jni build: context: . dockerfile: ci/docker/linux-apt-jni.dockerfile cache_from: - - ${REPO}:${ARCH}-debian-9-java-jni + - ${REPO}:${ARCH}-debian-9-java-${JDK}-maven-${MAVEN}-jni args: base: ${REPO}:${ARCH}-debian-9-java-${JDK}-maven-${MAVEN} llvm: ${LLVM} From 232aafa281faf7cbe97d84e41a058890fadf97e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Fri, 2 Jul 2021 13:10:23 +0200 Subject: [PATCH 5/5] 90m --- .github/workflows/java_jni.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java_jni.yml b/.github/workflows/java_jni.yml index 9484e18ce59..48351f3c22a 100644 --- a/.github/workflows/java_jni.yml +++ b/.github/workflows/java_jni.yml @@ -50,7 +50,7 @@ jobs: name: AMD64 Debian 9 Java JNI (Gandiva, Plasma, ORC, Dataset) runs-on: ubuntu-latest if: ${{ !contains(github.event.pull_request.title, 'WIP') }} - timeout-minutes: 120 + timeout-minutes: 90 steps: - name: Checkout Arrow uses: actions/checkout@v2