From 98cc4b00ee6d0f631266f98d89c973b2c4a9ebf1 Mon Sep 17 00:00:00 2001
From: Philip Gichuhi <pgichuhi@microsoft.com>
Date: Thu, 23 May 2024 16:46:28 +0300
Subject: [PATCH] Merge GitHub release steps to maven release workflow

---
 .github/workflows/git-release.yml         | 33 -----------------------
 .github/workflows/preview-and-release.yml | 10 +++++++
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 .github/workflows/git-release.yml

diff --git a/.github/workflows/git-release.yml b/.github/workflows/git-release.yml
deleted file mode 100644
index 3e3e1eadaa2..00000000000
--- a/.github/workflows/git-release.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Git Release
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-  workflow_dispatch:
-
-jobs:
-  Git_Release:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - uses: actions/checkout@v4
-      - name: Download Build Artifact
-        uses: dawidd6/action-download-artifact@v3.1.4
-        with:
-          workflow: preview-and-release.yml
-          workflow_conclusion: success
-          branch: main
-          event: push
-          name: drop
-          path: drop
-      # This action works with an existing release (created by the release bot) and uploads the build artifacts
-      - name: GitHub Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fail_on_unmatched_files: true
-          files: |
-            drop/build/**/*.jar
diff --git a/.github/workflows/preview-and-release.yml b/.github/workflows/preview-and-release.yml
index bd3f9341f87..7f3ae40d872 100644
--- a/.github/workflows/preview-and-release.yml
+++ b/.github/workflows/preview-and-release.yml
@@ -17,6 +17,9 @@ env:
   PREVIEW_TASK: publishSnapshotPublicationToSonatypeSnapshotRepository
   PUBLISH_TASK:  publishMavenCentralReleasePublicationToSonatypeRepository
 
+permissions:
+  contents: write
+
 jobs:
   maven_Preview:
     if: ${{ github.ref == 'refs/heads/main' }}
@@ -96,3 +99,10 @@ jobs:
             gradle.properties
             **/gradle/**
             Scripts/**
+      - name: GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fail_on_unmatched_files: true
+          files: |
+            build/**/*.jar