diff --git a/.github/workflows/test-java-os-mix.yml b/.github/workflows/test-java-os-mix.yml index 2e850250..5c2d4371 100644 --- a/.github/workflows/test-java-os-mix.yml +++ b/.github/workflows/test-java-os-mix.yml @@ -31,8 +31,8 @@ jobs: - name: Execute integration test (on Unixes) run: | + cd integration-test/gradle-plugin uname -a ./gradlew --version - ./gradlew info - ./gradlew integrationTestOnly --scan + ./gradlew htmlSanityCheck --scan diff --git a/build.gradle b/build.gradle index c8a687ec..75022b9d 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ plugins { allprojects { group = group - version = version + version = htmlSanityCheckVersion repositories { mavenLocal() diff --git a/gradle.properties b/gradle.properties index 765860be..5685c417 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # tag::version[] -version=2.0.0-SNAPSHOT +htmlSanityCheckVersion=2.0.0-SNAPSHOT # end::version[] group = org.aim42.htmlSanityCheck diff --git a/integration-test/gradle-plugin/build.gradle b/integration-test/gradle-plugin/build.gradle index 35b11d6a..f7ac3930 100644 --- a/integration-test/gradle-plugin/build.gradle +++ b/integration-test/gradle-plugin/build.gradle @@ -17,8 +17,9 @@ htmlSanityCheck { // where to put results of sanityChecks... checkingResultsDir = file("build/reports") - logger.quiet "docToolchain> HSC sourceDir: ${sourceDir.absolutePath}" - logger.quiet "docToolchain> HSC checkingResultsDir: ${checkingResultsDir.absolutePath}" + logger.quiet "HSC version: ${htmlSanityCheckVersion}" + logger.quiet "HSC sourceDir: ${sourceDir.absolutePath}" + logger.quiet "HSC checkingResultsDir: ${checkingResultsDir.absolutePath}" } tasks.register("clean", Delete) { diff --git a/integration-test/gradle-plugin/gradle.properties b/integration-test/gradle-plugin/gradle.properties deleted file mode 100644 index 17e654d5..00000000 --- a/integration-test/gradle-plugin/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -# This project is used for integration testing with the current version of htmlSanityCheck-gradle-plugin -# You need to set the desired version explicitely, e.g., by calling Gradle with '-PhtmlSanityCheckVersion=x.y.z' -htmlSanityCheckVersion = "PLEASE SPECIFY VERSION EXPICITELY" \ No newline at end of file diff --git a/integration-test/gradle-plugin/gradle.properties b/integration-test/gradle-plugin/gradle.properties new file mode 120000 index 00000000..03ca90c5 --- /dev/null +++ b/integration-test/gradle-plugin/gradle.properties @@ -0,0 +1 @@ +../../gradle.properties \ No newline at end of file