Attempt yet another configuration

deusaquilus · Feb 4, 2024 · 36c6d52 · 36c6d52
1 parent cdb3c22
commit 36c6d52
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -27,4 +27,4 @@ jobs:
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew ${{ matrix.build_command }} -Pplatform=${{ matrix.platform }} --stacktrace -Pnosign
+      - run: ./gradlew ${{ matrix.build_command }} -Pplatform=${{ matrix.platform }} --stacktrace -Pnosign -PisCI
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,18 +29,18 @@ jobs:
           include:
             - os: ubuntu-latest
               # On ubuntu publish everything you can i.e. the linuxX64 and jvm binaries
-              publish_command: publishAllPublicationsToOss
+              publish_command: build publishAllPublicationsToOss
               platform: linux
             - os: macOS-latest
-              publish_command: publishAllPublicationsToOss -x :pprint-kotlin:publishAllPublicationsToOss
+              publish_command: build publishAllPublicationsToOss -x :pprint-kotlin:build -x :pprint-kotlin:publishAllPublicationsToOss
               platform: mac
             - os: windows-latest
-              publish_command: publishMingwX64PublicationToOss -x :pprint-kotlin:publishMingwX64PublicationToOss
+              publish_command: build publishMingwX64PublicationToOss -x :pprint-kotlin:build -x :pprint-kotlin:publishMingwX64PublicationToOss
               platform: windows
       env:
         SONATYPE_REPOSITORY_ID: ${{ needs.create_staging_repository.outputs.repository_id }}
         SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEUSERNAME }}
-        SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPEPASSWORD }}
+        SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJESuccubus Academy EP4 RelasedCT_SONATYPEPASSWORD }}
         NEW_SIGNING_KEY_ID_BASE64: ${{ secrets.NEW_SIGNING_KEY_ID_BASE64 }}
         NEW_SIGNING_KEY_ID_BASE64_PASS: ${{ secrets.NEW_SIGNING_KEY_ID_BASE64_PASS }}
       steps:
@@ -52,4 +52,4 @@ jobs:
             distribution: 'adopt'
         - name: Validate Gradle wrapper
           uses: gradle/wrapper-validation-action@v1
-        - run: ./gradlew build ${{ matrix.publish_command }} -Pplatform=${{ matrix.platform }} -no-daemon --no-parallel -x test --stacktrace
+        - run: ./gradlew ${{ matrix.publish_command }} -Pplatform=${{ matrix.platform }} -PisCI -no-daemon --no-parallel --stacktrace
diff --git a/pprint-kotlin-core/build.gradle.kts b/pprint-kotlin-core/build.gradle.kts
@@ -1,7 +1,5 @@
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
-import org.jetbrains.dokka.gradle.AbstractDokkaTask
-import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -13,7 +11,7 @@ plugins {
 }
 
 kotlin {
-  val isLocal = project.hasProperty("local")
+  val isCI = project.hasProperty("isCI")
   val platform =
     if (project.hasProperty("platform"))
       project.property("platform")
@@ -23,7 +21,7 @@ kotlin {
   val isMac = platform == "mac"
   val isWindows = platform == "windows"
 
-  if (isLinux || isLocal) {
+  if (isLinux || !isCI) {
     jvm {
       jvmToolchain(11)
     }
@@ -46,7 +44,7 @@ kotlin {
     androidNativeArm64()
   }
 
-  if (isMac || isLocal) {
+  if (isMac || !isCI) {
     macosX64()
     macosArm64()
     iosX64()
@@ -59,7 +57,7 @@ kotlin {
     watchosArm64()
   }
 
-  if (isWindows || isLocal) {
+  if (isWindows || !isCI) {
     mingwX64()
   }
 

diff --git a/pprint-kotlin-kmp/build.gradle.kts b/pprint-kotlin-kmp/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 kotlin {
-  val isLocal = project.hasProperty("local")
+  val isCI = project.hasProperty("isCI")
   val platform =
     if (project.hasProperty("platform"))
       project.property("platform")
@@ -22,7 +22,7 @@ kotlin {
   val isMac = platform == "mac"
   val isWindows = platform == "windows"
 
-  if (isLinux || isLocal) {
+  if (isLinux || !isCI) {
     jvm {
       jvmToolchain(11)
     }
@@ -45,7 +45,7 @@ kotlin {
     androidNativeArm64()
   }
 
-  if (isMac || isLocal) {
+  if (isMac || !isCI) {
     macosX64()
     macosArm64()
     iosX64()
@@ -58,7 +58,7 @@ kotlin {
     watchosArm64()
   }
 
-  if (isWindows || isLocal) {
+  if (isWindows || !isCI) {
     mingwX64()
   }