From 964972d819d7d85efb33ebd32192cf593e18ff27 Mon Sep 17 00:00:00 2001
From: lgdd <louis-guillaume.durand@liferay.com>
Date: Tue, 16 Apr 2024 13:58:59 +0200
Subject: [PATCH] refactor(ci): separate release workflow

---
 .github/workflows/release-please.yml | 17 ++++++++++++++++
 .github/workflows/release.yml        | 30 ++++++++--------------------
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/release-please.yml

diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
new file mode 100644
index 0000000..75fbfa2
--- /dev/null
+++ b/.github/workflows/release-please.yml
@@ -0,0 +1,17 @@
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: write
+  pull-requests: write
+
+name: Release Please
+
+jobs:
+  release-please:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: google-github-actions/release-please-action@v4
+        id: release
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c976f4c..9c29e3f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,23 +1,11 @@
 on:
-  push:
-    branches:
-      - main
-
-permissions:
-  contents: write
-  pull-requests: write
+  release:
+    types: [published]
 
 name: Release
 
 jobs:
-  release-please:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: google-github-actions/release-please-action@v4
-        id: release
-  upload-release:
-    needs: release-please
-    if: needs.release-please.outputs.release_created
+  upload-jar:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -30,12 +18,11 @@ jobs:
       - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          gh release upload ${{ needs.release-please.outputs.tag_name }} $(ls target/*-runner.jar)
+          gh release upload ${{ github.event.release.name }} $(ls target/*-runner.jar)
   push-java-docker-image:
-    needs: release-please
-    if: needs.release-please.outputs.release_created
     runs-on: ubuntu-latest
     steps:
+      - run: echo "APP_VERSION=$(${{ github.event.release.name }} | cut -d'v' -f 2)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -51,12 +38,11 @@ jobs:
         with:
           file: Dockerfile.jvm
           push: true
-          tags: lgdd/liferay-starter:latest-jvm,lgdd/liferay-starter:${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}.${{ needs.release-please.outputs.patch }}-jvm
+          tags: lgdd/liferay-starter:latest-jvm,lgdd/liferay-starter:$APP_VERSION-jvm
   push-native-docker-image:
-    needs: release-please
-    if: needs.release-please.outputs.release_created
     runs-on: ubuntu-latest
     steps:
+      - run: echo "APP_VERSION=$(${{ github.event.release.name }} | cut -d'v' -f 2)" >> $GITHUB_ENV
       - uses: actions/checkout@v4
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -72,4 +58,4 @@ jobs:
         with:
           file: Dockerfile.native
           push: true
-          tags: lgdd/liferay-starter:latest,lgdd/liferay-starter:${{ needs.release-please.outputs.major }}.${{ needs.release-please.outputs.minor }}.${{ needs.release-please.outputs.patch }}
\ No newline at end of file
+          tags: lgdd/liferay-starter:latest,lgdd/liferay-starter:$APP_VERSION
\ No newline at end of file