From 4c77a430cb75f15505fb0965556c8fb44dc969a4 Mon Sep 17 00:00:00 2001
From: Marios Andreopoulos <opensource@andmarios.com>
Date: Sun, 8 Nov 2020 18:45:50 +0200
Subject: [PATCH] Fix Github release

Signed-off-by: Marios Andreopoulos <opensource@andmarios.com>
---
 .github/workflows/publish-manually.yml | 14 ++++++++------
 .github/workflows/publish.yml          | 16 +++++++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/publish-manually.yml b/.github/workflows/publish-manually.yml
index f31fd33..671d213 100644
--- a/.github/workflows/publish-manually.yml
+++ b/.github/workflows/publish-manually.yml
@@ -23,16 +23,18 @@ jobs:
       - name: Get the tag
         id: get_tag
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
+      - name: Build shadowJar for Github
+        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} shadowJar
+      - name: Release to Github
+        uses: softprops/action-gh-release@v1
+        with:
+          files: build/libs/secret-provider-${{ steps.get_tag.outputs.VERSION }}-all.jar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Upload archive
         run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} signArchives uploadArchives
       - name: Wait for nexus to settle
         run: sleep 30
       - name: Release archive
         run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} closeAndReleaseRepository
-      - name: Release to Github
-        uses: softprops/action-gh-release@v1
-        with:
-          files: build/libs/*-all.jar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a69905a..c29bbaa 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -26,15 +26,17 @@ jobs:
       - name: Get the tag
         id: get_tag
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-      - name: Upload archive
-        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} signArchives uploadArchives
-      - name: Wait for nexus to settle
-        run: sleep 30
-      - name: Release archive
-        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} closeAndReleaseRepository
+      - name: Build shadowJar for Github
+        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} shadowJar
       - name: Release to Github
         uses: softprops/action-gh-release@v1
         with:
-          files: build/libs/*-all.jar
+          files: build/libs/secret-provider-${{ steps.get_tag.outputs.VERSION }}-all.jar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and upload jar to nexus
+        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} signArchives uploadArchives
+      - name: Wait for nexus to settle
+        run: sleep 30
+      - name: Release to nexus
+        run: ./gradlew -Prelease -Pversion=${{ steps.get_tag.outputs.VERSION }} closeAndReleaseRepository