From c801a9703f9d8a5c045ceb3610d924b155488b89 Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Wed, 27 Mar 2024 18:54:49 +0100
Subject: [PATCH] Tidy publishing config (#17)

* remove custom POM location (Gradle gets confused)

* - update GitHub actions
- use new `gradle/actions/setup-gradle`
- block cancel-in-progress for publish.yml
---
 .github/workflows/gradle.yml                  | 17 ++++++++--------
 .github/workflows/publish.yml                 | 20 +++++++++++--------
 .../conventions/publishing.gradle.kts         |  4 ----
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 649163f..76bd6c9 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -28,7 +28,7 @@ jobs:
       GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK ${{ matrix.java-version }}
         uses: actions/setup-java@v3
@@ -37,17 +37,16 @@ jobs:
           java-version: ${{ matrix.java-version }}
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Cache Kotlin Konan
-        id: cache-kotlin-konan
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.konan/**/*
           key: kotlin-konan-${{ runner.os }}
 
-      - name: Test with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
-          arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Publish
+        run: ./gradlew check build --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index cd65021..5ac1f4c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -9,32 +9,36 @@ env:
   ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGN_SECRET_KEY }}
   ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGN_SECRET_PWD }}
 
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
+  # Don't cancel midway through publishing if another workflow is triggered, it might cause partial publications
+  cancel-in-progress: false
+
 jobs:
   publish:
     runs-on: macos-latest
-    env:
-      GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           java-version: "11"
           distribution: "zulu"
-          cache: "gradle"
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Cache Kotlin Konan
-        id: cache-kotlin-konan
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.konan/**/*
           key: kotlin-konan-${{ runner.os }}
 
-      - name: Build
-        uses: gradle/gradle-build-action@v2
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Publish
         run: ./gradlew publish --no-parallel --stacktrace
diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts
index 7414726..6afd9e1 100644
--- a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts
+++ b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts
@@ -87,10 +87,6 @@ tasks {
         val signingRequiredPredicate = provider { signing.isRequired }
         onlyIf { signingRequiredPredicate.get() }
     }
-
-    withType<GenerateMavenPom> {
-        destination = file("$projectDir/pom.xml")
-    }
 }
 
 // https://youtrack.jetbrains.com/issue/KT-46466