From 7d0b5ffa662e98ca0d87f9c74af93d6c3e4e2399 Mon Sep 17 00:00:00 2001 From: pipinet Date: Sun, 28 Jul 2024 11:34:37 +0800 Subject: [PATCH] chroe: add earthly --- Earthfile | 9 +++++---- auditing/src/main/resources/META-INF/beans.xml | 5 +++++ basic-tree/build.gradle | 2 +- basic-tree/src/main/resources/META-INF/beans.xml | 5 +++++ build.gradle | 1 + gradle.properties | 2 +- gradle/build.gradle | 11 +++++++++++ gradle/version.gradle | 3 ++- jakarta-json/src/main/resources/META-INF/beans.xml | 5 +++++ lang/build.gradle | 2 +- settings.gradle | 4 ++-- 11 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 gradle/build.gradle create mode 100644 jakarta-json/src/main/resources/META-INF/beans.xml diff --git a/Earthfile b/Earthfile index 384d3c6..de651c2 100644 --- a/Earthfile +++ b/Earthfile @@ -13,13 +13,14 @@ build-base: FROM ${BUILD_IMAGE} WORKDIR /app COPY . . - RUN ./gradlew clean + RUN gradle clean SAVE IMAGE --cache-hint check: FROM +build-base - RUN ./gradlew :basic-tree:test --tests "com.qwlabs.tree.LocationComparatorTest" --stacktrace --no-parallel --no-daemon -# RUN ./gradlew prepush --no-parallel --no-daemon +# RUN gradle :lang:test --stacktrace --no-parallel --no-daemon +# RUN gradle :basic-tree:test --tests "com.qwlabs.tree.LocationComparatorTest" --stacktrace --no-parallel --no-daemon + RUN gradle prepush --no-parallel --no-daemon publish: FROM +build-base @@ -28,7 +29,7 @@ publish: RUN --secret GPG_PASSPHRASE export ORG_GRADLE_PROJECT_signingPassword="$GPG_PASSPHRASE" RUN --secret OSSRH_TOKEN_USERNAME export OSSRH_TOKEN_USERNAME="$OSSRH_TOKEN_USERNAME" RUN --secret OSSRH_TOKEN_PASSWORD export OSSRH_TOKEN_PASSWORD="$OSSRH_TOKEN_PASSWORD" - RUN ./gradlew publish --no-parallel --no-daemon + RUN gradle publish --no-parallel --no-daemon ci-check: BUILD +check diff --git a/auditing/src/main/resources/META-INF/beans.xml b/auditing/src/main/resources/META-INF/beans.xml index e69de29..8983449 100644 --- a/auditing/src/main/resources/META-INF/beans.xml +++ b/auditing/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + diff --git a/basic-tree/build.gradle b/basic-tree/build.gradle index c789cbd..58f2658 100644 --- a/basic-tree/build.gradle +++ b/basic-tree/build.gradle @@ -1,4 +1,4 @@ -//apply from: "${rootProject.rootDir}/gradle/jmh.gradle" +apply from: "${rootProject.rootDir}/gradle/jmh.gradle" dependencies { api project(":lang") diff --git a/basic-tree/src/main/resources/META-INF/beans.xml b/basic-tree/src/main/resources/META-INF/beans.xml index e69de29..8983449 100644 --- a/basic-tree/src/main/resources/META-INF/beans.xml +++ b/basic-tree/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + diff --git a/build.gradle b/build.gradle index a547967..d6fecb0 100644 --- a/build.gradle +++ b/build.gradle @@ -24,6 +24,7 @@ subprojects { apply from: "${rootProject.rootDir}/gradle/lombok.gradle" apply from: "${rootProject.rootDir}/gradle/logging.gradle" apply from: "${rootProject.rootDir}/gradle/check.gradle" + apply from: "${rootProject.rootDir}/gradle/build.gradle" apply from: "${rootProject.rootDir}/gradle/publication.gradle" repositories { diff --git a/gradle.properties b/gradle.properties index bd431a1..75a9c67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ nexusPublishPluginVersion=2.0.0 jmhPluginId=me.champeau.jmh jmhPluginVersion=0.7.2 -quarkusVersion=3.12.3 +quarkusVersion=3.13.0 junitVersion=5.10.2 jmhVersion=1.37 guavaVersion=33.2.1-jre diff --git a/gradle/build.gradle b/gradle/build.gradle new file mode 100644 index 0000000..7a43887 --- /dev/null +++ b/gradle/build.gradle @@ -0,0 +1,11 @@ +tasks.named('checkstyleMain') { + dependsOn('jandex') +} + +tasks.named('checkstyleTest') { + dependsOn('jandex') +} + +tasks.named('compileTestJava') { + dependsOn('jandex') +} diff --git a/gradle/version.gradle b/gradle/version.gradle index e1165d7..9f5c88a 100644 --- a/gradle/version.gradle +++ b/gradle/version.gradle @@ -10,4 +10,5 @@ def loadVersion() { return file.text + '.' + pipelineId } -version = loadVersion() \ No newline at end of file +version = loadVersion() + diff --git a/jakarta-json/src/main/resources/META-INF/beans.xml b/jakarta-json/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..8983449 --- /dev/null +++ b/jakarta-json/src/main/resources/META-INF/beans.xml @@ -0,0 +1,5 @@ + + diff --git a/lang/build.gradle b/lang/build.gradle index 0072384..a98c33e 100644 --- a/lang/build.gradle +++ b/lang/build.gradle @@ -1,4 +1,4 @@ -//apply from: "${rootProject.rootDir}/gradle/jmh.gradle" +apply from: "${rootProject.rootDir}/gradle/jmh.gradle" dependencies { api "com.google.guava:guava:${guavaVersion}" diff --git a/settings.gradle b/settings.gradle index 2615b7a..c151f2c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,6 +19,8 @@ pluginManagement { rootProject.name = 'doraemon' include 'lang' +include 'basic-tree' +include 'mptt-tree' include 'exceptions' include 'panache' include 'jakarta-json' @@ -32,8 +34,6 @@ include 'q-api' include 'q-parser-antlr4' include 'cdi' include 'security' -include 'basic-tree' -include 'mptt-tree' include 'quarkus-cache' include 'quarkus-tenant' include 'quarkus-http'