diff --git a/.github/workflows/test-java-os-mix.yml b/.github/workflows/test-java-os-mix.yml index 8e4dc522..5f43462b 100644 --- a/.github/workflows/test-java-os-mix.yml +++ b/.github/workflows/test-java-os-mix.yml @@ -21,18 +21,11 @@ jobs: - uses: actions/setup-java@v3 with: distribution: temurin - # Always build with JDK 8 initially java-version: ${{ matrix.java-version }} - name: Execute integration test (on Unixes) -# if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }} run: | uname -a ./gradlew --version + ./gradlew info ./gradlew integrationTestOnly --scan -# - name: Execute integration test (on Windows) -# if: ${{ runner.os == 'Windows' }} -# run: | -# uname -a -# gradlew --version -# gradlew integrationTestOnly --scan diff --git a/build.gradle b/build.gradle index 526598a8..d3cc0c83 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,10 @@ allprojects { println "projectDir : " + projectDir println "groupId : " + project.group println "targetCompatibility : " + java.targetCompatibility + println "OS : " + System.properties["os.name"] + println "Java VM Name : " + System.properties["java.vm.name"] + println "Java VM Vendor : " + System.properties["java.vm.vendor"] + println "Java VM Version : " + System.properties["java.vm.version"] println "=" * 80 } } @@ -100,7 +104,7 @@ tasks.register("integrationTestOnly") { doLast { def result = exec { workingDir INTEGRATION_TEST_DIRECTORY - commandLine System.getProperty("os.name") == "Windows" ? "gradlew.bat" : "./gradlew", "clean", "htmlSanityCheck", "-PhtmlSanityCheckVersion=${project.version}" + commandLine System.getProperty("os.name") ==~ "Windows" ? "gradlew.bat" : "./gradlew", "clean", "htmlSanityCheck", "-PhtmlSanityCheckVersion=${project.version}" } logger.debug "Script output: $result" File integrationTestDirectory = file(INTEGRATION_TEST_DIRECTORY)