From 6474fe80be99c903071c27e402ce65245a5b3f8c Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Fri, 19 Jul 2024 15:00:39 +0530
Subject: [PATCH 1/2] generate release notes as a part of release workflow

---
 .github/workflows/deploy.yml | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index f5a912a55..b1f4c2137 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,7 +5,7 @@ on:
       - '*'
 
 jobs:
-  build:
+  release:
     name: Deploy
     runs-on: ubuntu-latest
     steps:
@@ -16,8 +16,9 @@ jobs:
           persist-credentials: false
 
       - name: Setup Java 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 11
 
       - name: Grant execute permission for gradlew
@@ -44,14 +45,6 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
           GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }}
 
-      - name: Release Client plugins
-        if: steps.deploy.outputs.exit_code == 0
-        run: |
-          TAG=${GITHUB_REF/refs\/tags\//}
-          bash $GITHUB_WORKSPACE/.github/scripts/release-plugins.sh $TAG $PAT
-        env:
-          PAT: ${{ secrets.PAT }}
-
       - name: Commit next development version
         if: steps.deploy.outputs.exit_code == 0
         run: |
@@ -63,4 +56,23 @@ jobs:
           git commit gradle.properties -m "Prepare development of $newVersion"
           git push https://gluon-bot:$PAT@github.com/$GITHUB_REPOSITORY HEAD:master
         env:
-          PAT: ${{ secrets.PAT }}
\ No newline at end of file
+          PAT: ${{ secrets.PAT }}
+
+  release-notes:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - name: Create GitHub release
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
+
+  release-client-plugins:
+    runs-on: ubuntu-latest
+    needs: [ release ]
+    steps:
+      - run: |
+          TAG=${GITHUB_REF/refs\/tags\//}
+          bash $GITHUB_WORKSPACE/.github/scripts/release-plugins.sh $TAG $PAT
+        env:
+          PAT: ${{ secrets.PAT }}

From 1dedd7d603e36dccc2928c83265b28e089925074 Mon Sep 17 00:00:00 2001
From: Abhinay Agarwal <abhinay.agarwal@gluonhq.com>
Date: Fri, 19 Jul 2024 15:25:57 +0530
Subject: [PATCH 2/2] address feedback

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b1f4c2137..9c80937b0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -67,7 +67,7 @@ jobs:
         with:
           generate_release_notes: true
 
-  release-client-plugins:
+  release-gluonfx-plugins:
     runs-on: ubuntu-latest
     needs: [ release ]
     steps: