From 1f9c2515f17514208a9ffb17145339a931b7864d Mon Sep 17 00:00:00 2001 From: David Smiley Date: Fri, 30 May 2025 21:58:40 -0400 Subject: [PATCH 1/3] Build/CI: Modernize build.yml * Test on more Java versions * Remove travis.yml; unused --- .github/workflows/build.yml | 29 +++++++++++++++++++++-------- .travis.yml | 24 ------------------------ 2 files changed, 21 insertions(+), 32 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1c8197f72..7759e3392 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,21 +1,34 @@ # This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven name: Java CI with Maven -on: [ push, pull_request ] +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + java: [ '8', '11', '17', '21' ] steps: - - uses: actions/checkout@v2 - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - uses: actions/checkout@v4 + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 with: - java-version: '8' - distribution: 'adopt' + java-version: ${{ matrix.java }} + distribution: 'temurin' cache: maven - name: Build with Maven - run: mvn --batch-mode --update-snapshots verify \ No newline at end of file + run: mvn --batch-mode --update-snapshots verify + + - name: Publish Test Results + if: always() + uses: EnricoMi/publish-unit-test-result-action@v2 + with: + files: target/surefire-reports/*.xml \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ffa34b4e5..000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: java - -sudo: false - -script: mvn -Drandomized.multiplier=10 clean verify jacoco:report -arch: - - amd64 - - ppc64le -jdk: - - oraclejdk8 - - openjdk8 - - openjdk11 -#TODO - oraclejdk9 - -dist: trusty # Travis Xenial doesn't have oraclejdk8 - -notifications: - email: - - spatial4j-dev@locationtech.org - -after_success: - - du -hs target/site/jacoco/jacoco.xml - - bash <(curl -s https://codecov.io/bash) - From 53dbd8a9ca505f11a98ed0b58fd7bdf700472f67 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Fri, 30 May 2025 22:13:06 -0400 Subject: [PATCH 2/3] Just do 8 & 11 for now (both should pass) --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7759e3392..2a4acdfc3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11', '17', '21' ] + java: [ '8', '11' ] steps: - uses: actions/checkout@v4 From d28d5fe895e46fd95e5d9a212c2a394efed2a247 Mon Sep 17 00:00:00 2001 From: David Smiley Date: Fri, 30 May 2025 22:18:57 -0400 Subject: [PATCH 3/3] fail-fast: false --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2a4acdfc3..47c73dc76 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,6 +13,7 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: java: [ '8', '11' ]