diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1247ef4..42df1ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,6 +67,7 @@ jobs: run: | ./gradlew -Dgradle.publish.key="$GRADLE_PUBLISH_KEY" -Dgradle.publish.secret="$GRADLE_PUBLISH_SECRET" publishPlugins + # Until Creek fully supports Windows, minimal check: build_windows: runs-on: windows-latest steps: @@ -82,7 +83,7 @@ jobs: with: gradle-home-cache-cleanup: true - name: Build - run: ./gradlew.bat build + run: ./gradlew.bat build -PexcludeContainerised create-gh-release: if: startsWith(github.ref, 'refs/tags/') && !endsWith(github.ref, '-alpha') diff --git a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts index 7ec9e39..7d3527e 100644 --- a/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts +++ b/buildSrc/src/main/kotlin/creek-common-convention.gradle.kts @@ -19,14 +19,14 @@ * * <p>Apply to all java modules, usually excluding the root project in multi-module sets. * - * <p>Version: 1.8 + * <p>Versions: + * - 1.10: Add ability to exclude containerised tests * - 1.9: Add `allDeps` task. * - 1.8: Tweak test config to reduce build speed. * - 1.7: Switch to setting Java version via toolchain * - 1.6: Remove GitHub packages for snapshots * - 1.5: Add filters to exclude generated sources * - 1.4: Add findsecbugs-plugin - * - 1.3: Fail on warnings for test code too. */ plugins { @@ -71,7 +71,12 @@ tasks.withType<JavaCompile> { } tasks.test { - useJUnitPlatform() + useJUnitPlatform() { + if (project.hasProperty("excludeContainerised")) { + excludeTags("ContainerisedTest") + } + } + setForkEvery(5) maxParallelForks = Runtime.getRuntime().availableProcessors() testLogging {