This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new 255f5c294 update setup-java@v4
new 05dd97ef4 Merge remote-tracking branch 'origin/main'
255f5c294 is described below
commit 255f5c29433e41b69300e90671cadb90385f3e8f
Author: tallison <[email protected]>
AuthorDate: Mon Oct 21 16:56:53 2024 -0400
update setup-java@v4
---
.github/workflows/main-jdk17-build.yml | 5 ++++-
.github/workflows/main-jdk21-build.yml | 3 ++-
.github/workflows/main-jdk23-build.yml | 3 ++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/main-jdk17-build.yml
b/.github/workflows/main-jdk17-build.yml
index 6ce136c0f..5a0b18edd 100644
--- a/.github/workflows/main-jdk17-build.yml
+++ b/.github/workflows/main-jdk17-build.yml
@@ -18,6 +18,8 @@
name: main jdk17 build
on:
+ pull_request:
+ branches: [ main ]
push:
branches: [ main ]
@@ -31,8 +33,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn clean test install javadoc:aggregate
diff --git a/.github/workflows/main-jdk21-build.yml
b/.github/workflows/main-jdk21-build.yml
index 67cf8f95c..10fb27dbb 100644
--- a/.github/workflows/main-jdk21-build.yml
+++ b/.github/workflows/main-jdk21-build.yml
@@ -31,8 +31,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn clean test install javadoc:aggregate
diff --git a/.github/workflows/main-jdk23-build.yml
b/.github/workflows/main-jdk23-build.yml
index cab6f9fc5..e6e7106fa 100644
--- a/.github/workflows/main-jdk23-build.yml
+++ b/.github/workflows/main-jdk23-build.yml
@@ -31,8 +31,9 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v4
with:
+ distribution: 'temurin'
java-version: ${{ matrix.java }}
- name: Build with Maven
run: mvn clean test install javadoc:aggregate