From a1a7d63216b67c070432bf47fb55f29934e292b0 Mon Sep 17 00:00:00 2001
From: Simon Templer <simon@wetransform.to>
Date: Tue, 20 Aug 2024 11:06:18 +0200
Subject: [PATCH 1/2] ci: update shared gradle workflows

---
 .github/workflows/check.yml   | 4 ++--
 .github/workflows/publish.yml | 4 ++--
 .github/workflows/release.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 62f2496..5793207 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -7,12 +7,12 @@ on:
 
 jobs:
   check:
-    uses: wetransform/gha-workflows/.github/workflows/gradle-library-check.yml@2c69afaa675dfca01d1bb1acb6150187f0dad05a # v2.3.0
+    uses: wetransform/gha-workflows/.github/workflows/gradle-library-check.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
 
   docker:
-    uses: wetransform/gha-workflows/.github/workflows/gradle-service-check.yml@2c69afaa675dfca01d1bb1acb6150187f0dad05a # v2.3.0
+    uses: wetransform/gha-workflows/.github/workflows/gradle-service-check.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
       image-tag: wetransform/hale-cli:latest # image to scan
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 8cd998c..4ac9ced 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   artifacts:
-    uses: wetransform/gha-workflows/.github/workflows/gradle-library.yml@2c69afaa675dfca01d1bb1acb6150187f0dad05a # v2.3.0
+    uses: wetransform/gha-workflows/.github/workflows/gradle-library.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
       build-tasks: clean check distZip buildDeb
@@ -26,7 +26,7 @@ jobs:
       WETF_ARTIFACTORY_PASSWORD: ${{ secrets.WETF_ARTIFACTORY_PASSWORD }}
 
   docker:
-    uses: wetransform/gha-workflows/.github/workflows/gradle-service-publish.yml@2c69afaa675dfca01d1bb1acb6150187f0dad05a # v2.3.0
+    uses: wetransform/gha-workflows/.github/workflows/gradle-service-publish.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
       image-tag: wetransform/hale-cli:latest # image to scan
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c2b9e4c..5ddd700 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   release:
-    uses: wetransform/gha-workflows/.github/workflows/gradle-library-publish.yml@feat/release-outputs # TODO merge related branch and replace with release version once tested
+    uses: wetransform/gha-workflows/.github/workflows/gradle-library-publish.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
       build-tasks: clean check distZip buildDeb
@@ -33,7 +33,7 @@ jobs:
   docker:
     needs: [release]
     if: ${{ needs.release.outputs.release-published != 'false' && needs.release.outputs.release-published != '' }}
-    uses: wetransform/gha-workflows/.github/workflows/gradle-service-publish.yml@feat/release-outputs # TODO merge related branch and replace with release version once tested
+    uses: wetransform/gha-workflows/.github/workflows/gradle-service-publish.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       checkout-ref: refs/tags/v${{needs.release.outputs.release-version}} # check out release tag
       java-version: 17

From b64b7950b176e74f5ad0db5c5758dccb165d1a52 Mon Sep 17 00:00:00 2001
From: Simon Templer <simon@wetransform.to>
Date: Tue, 20 Aug 2024 11:11:23 +0200
Subject: [PATCH 2/2] ci: build artifacts during release only after setting
 release version

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5ddd700..3876f86 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,8 +18,8 @@ jobs:
     uses: wetransform/gha-workflows/.github/workflows/gradle-library-publish.yml@06a242e21c2f8e81407d629a67b747eea7c91706 # v2.4.0
     with:
       java-version: 17
-      build-tasks: clean check distZip buildDeb
-      publish-tasks: publish
+      build-tasks: clean check
+      publish-tasks: distZip buildDeb publish # performed after setting release version
       multi-module: false
       semantic-release: true
       semantic-release-dryrun: ${{ inputs.dryRun }}