Skip to content

Commit

Permalink
Revert "Added Azul Zulu OpenJDK v21 to Build and Test Workflow (#105)" (
Browse files Browse the repository at this point in the history
#107)

This reverts commit aa949f8.
  • Loading branch information
azagniotov committed Feb 22, 2024
1 parent aa949f8 commit 8cf2ce8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java-version: [ "8.0.392+8", "11.0.21+9", "17.0.9+9", "21.0.2+13" ]
java-version: [ "8.0.392+8", "11.0.21+9", "17.0.9+9" ]

steps:
- name: Checkout project sources
Expand All @@ -32,17 +32,17 @@ jobs:
uses: ./.github/actions/download-and-cache-sudachi-dictionary

- name: Build
run: ./gradlew -PciRun build
run: ./gradlew build

- name: Run unit tests
run: ./gradlew -PciRun clean test
run: ./gradlew clean test

- name: Run integration tests utilizing Tokenizer/Analyzer and imported Lucene Kuromoji tests
run: ./gradlew -PciRun clean integrationTest
run: ./gradlew clean integrationTest

- name: Run functional tests utilizing Lucene
run: ./gradlew -PciRun clean functionalTest
run: ./gradlew clean functionalTest

- name: Run end-to-end tests utilizing a Solr instance
run: ./gradlew -PciRun clean endToEndTest
run: ./gradlew clean endToEndTest

5 changes: 0 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,3 @@ apply from: "$rootDir/conf/gradle/tests.gradle"
apply from: "$rootDir/conf/gradle/sudachi.gradle"
apply from: "$rootDir/conf/gradle/spotless.gradle"
apply from: "$rootDir/conf/gradle/artifacts.gradle"

// Disabling the Spotless plugin on Ci due to its v6.13.0 incompatability with JDK 21
if (!project.hasProperty("ciRun")) {
apply from: "$rootDir/conf/gradle/spotless.gradle"
}

0 comments on commit 8cf2ce8

Please sign in to comment.