Complete CI integration (#5)

aecsocket · web-flow · commit 78de40532e9d · 2023-03-28T20:47:45.000+01:00
So many failed pipeline runs
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,14 +44,14 @@ jobs:
           echo version_type=$version_type
           echo version_type=$version_type >> $env:GITHUB_ENV
       - name: "Publish snapshot"
-        if: ${{ env.version_type == 'snapshot' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ env.version_type == 'snapshot' && github.event_name == 'push' }}
         run: ./gradlew publish
         env:
           CI_PUBLISH_CORE: ${{ matrix.publish-core }}
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: "Publish release"
-        if: ${{ env.version_type == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+        if: ${{ env.version_type == 'release' && github.event_name == 'push' }}
         run: ./gradlew --info -PforceSign=true publishToSonatype closeSonatypeStagingRepository
         env:
           CI_PUBLISH_CORE: ${{ matrix.publish-core }}
diff --git a/build-logic/src/main/kotlin/Extensions.kt b/build-logic/src/main/kotlin/Extensions.kt
@@ -1,5 +1,7 @@
 import org.gradle.api.Project
 import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.plugins.signing.SigningExtension
 import java.io.File
 
 val Project.cpuFeaturesDir: File
@@ -11,8 +13,10 @@ val Project.ci: Provider<Boolean>
 val Project.ciPublishCore: Provider<Boolean>
     get() = providers.environmentVariable("CI_PUBLISH_CORE").map { it.toBoolean() }.orElse(false)
 
-fun Project.publishCore() {
-    if (!ci.get() || ciPublishCore.get()) {
-        plugins.apply("publishing-conventions")
-    }
+fun Project.publishCore(): Boolean {
+    if (ci.get() && !ciPublishCore.get())
+        return false
+
+    plugins.apply("publishing-conventions")
+    return true
 }
diff --git a/build-logic/src/main/kotlin/parent-conventions.gradle.kts b/build-logic/src/main/kotlin/parent-conventions.gradle.kts
@@ -1,7 +1,14 @@
 plugins {
     id("net.kyori.indra.publishing.sonatype")
+    id("publishing-conventions")
 }
 
 indraSonatype {
     useAlternateSonatypeOSSHost("s01")
 }
+
+tasks.register("printVersionType") {
+    doFirst {
+        println(if (net.kyori.indra.util.Versioning.isSnapshot(project)) "snapshot" else "release")
+    }
+}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,10 +3,9 @@ plugins {
     id("java-conventions")
 }
 
-publishCore()
 
 group = "io.github.aecsocket"
-version = "2.0.1-SNAPSHOT"
+version = "2.0.1"
 description = "Java bindings for Google cpu_features"
 
 dependencies {
@@ -21,8 +20,10 @@ dependencies {
     testRuntimeOnly(projects.cpuFeaturesJavaNativesMacosX86)
 }
 
-tasks.register("printVersionType") {
-    doFirst {
-        println(if (net.kyori.indra.util.Versioning.isSnapshot(project)) "snapshot" else "release")
+if (!publishCore()) {
+    tasks {
+        withType<PublishToMavenRepository> {
+            enabled = false
+        }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,14 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("net.kyori.indra.publishing.sonatype")`
	`3`	`+ id("publishing-conventions")`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`indraSonatype {`
`6`	`7`	`useAlternateSonatypeOSSHost("s01")`
`7`	`8`	`}`
	`9`	`+`
	`10`	`+tasks.register("printVersionType") {`
	`11`	`+ doFirst {`
	`12`	`+ println(if (net.kyori.indra.util.Versioning.isSnapshot(project)) "snapshot" else "release")`
	`13`	`+ }`
	`14`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -3,10 +3,9 @@ plugins {`
`3`	`3`	`id("java-conventions")`
`4`	`4`	`}`
`5`	`5`
`6`		`-publishCore()`
`7`	`6`
`8`	`7`	`group = "io.github.aecsocket"`
`9`		`-version = "2.0.1-SNAPSHOT"`
	`8`	`+version = "2.0.1"`
`10`	`9`	`description = "Java bindings for Google cpu_features"`
`11`	`10`
`12`	`11`	`dependencies {`
`@@ -21,8 +20,10 @@ dependencies {`
`21`	`20`	`testRuntimeOnly(projects.cpuFeaturesJavaNativesMacosX86)`
`22`	`21`	`}`
`23`	`22`
`24`		`-tasks.register("printVersionType") {`
`25`		`- doFirst {`
`26`		`- println(if (net.kyori.indra.util.Versioning.isSnapshot(project)) "snapshot" else "release")`
	`23`	`+if (!publishCore()) {`
	`24`	`+ tasks {`
	`25`	`+ withType<PublishToMavenRepository> {`
	`26`	`+ enabled = false`
	`27`	`+ }`
`27`	`28`	`}`
`28`	`29`	`}`