first attempt at CI with gradle

pschichtel · Jul 3, 2024 · b873690 · b873690
1 parent 2a5dc3e
commit b873690
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml → .github/workflows/gradle.yml b/.github/workflows/maven.yml → .github/workflows/gradle.yml
@@ -19,12 +19,12 @@ jobs:
       with:
         java-version: '8'
         distribution: 'temurin'
-        cache: maven
+        cache: gradle
         server-id: ossrh
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
-    - name: Build with Maven
-      run: ./mvnw -B package deploy -Djavacan.compile-script="$PWD/ci/compile-native.sh" -Pall-architectures,android
+    - name: Build
+      run: ./gradlew publish
       env:
         MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
diff --git a/conventions/src/main/kotlin/tel.schich.javacan.convention.native.gradle.kts b/conventions/src/main/kotlin/tel.schich.javacan.convention.native.gradle.kts
@@ -1,4 +1,5 @@
 import org.gradle.configurationcache.extensions.capitalized
+import tel.schich.dockcross.execute.DockerRunner
 import tel.schich.dockcross.execute.NonContainerRunner
 import tel.schich.dockcross.tasks.DockcrossRunTask
 
@@ -7,6 +8,8 @@ plugins {
     id("tel.schich.dockcross")
 }
 
+val ci = System.getenv("CI") != null
+
 val archDetectConfiguration by configurations.registering {
     isCanBeConsumed = true
 }
@@ -98,6 +101,10 @@ fun DockcrossRunTask.baseConfigure(linkMode: NativeLinkMode, outputTo: Directory
         listOf("cmake", relativePathToProject, projectVersionOption, releaseOption, linkStaticallyOption),
         listOf("make", "-j${project.gradle.startParameter.maxWorkerCount}"),
     )
+
+    if (ci) {
+        runner(DockerRunner())
+    }
 }
 
 fun Jar.baseConfigure(compileTask: TaskProvider<DockcrossRunTask>, buildOutputDir: Directory) {
@@ -132,8 +139,17 @@ for (target in targets) {
         dockcrossTag = tag
         image = dockcrossImage
         containerName = "dockcross-${project.name}-$classifier"
+
+        if (ci) {
+            doLast {
+                exec {
+                    commandLine("docker", "image", "rm", "$repo:$tag")
+                }
+            }
+        }
     }
 
+
     val packageNative = tasks.register("packageNativeFor$taskSuffix", Jar::class) {
         baseConfigure(compileNative, buildOutputDir.get())
 

diff --git a/conventions/src/main/kotlin/tel.schich.javacan.convention.published.gradle.kts b/conventions/src/main/kotlin/tel.schich.javacan.convention.published.gradle.kts
@@ -4,6 +4,8 @@ plugins {
     `maven-publish`
 }
 
+val ci = System.getenv("CI") != null
+
 java {
     withSourcesJar()
     withJavadocJar()
@@ -42,7 +44,9 @@ publishing {
     }
 }
 
-signing {
-    useGpgCmd()
-    sign(publishing.publications)
+if (!ci) {
+    signing {
+        useGpgCmd()
+        sign(publishing.publications)
+    }
 }