From 3acd6382187521e6ce75aff43586f41db6f501fc Mon Sep 17 00:00:00 2001
From: Marek Michali <56163696+MarekMichali@users.noreply.github.com>
Date: Mon, 22 Apr 2024 12:55:28 +0200
Subject: [PATCH] Enhance release workflow (#672)

Enchance release workflow
---
 .github/workflows/create-release.yaml | 3 ++-
 scripts/upload_assets.sh              | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index ec587fd51..55f592322 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -110,6 +110,7 @@ jobs:
         run: | 
           if [ "$PR_NUMBER" -gt 0 ]; then
             scripts/await_pr_merge.sh
+            git push origin -d ${{ env.BRANCH_NAME }}
           else
             echo "Step skipped"
           fi
@@ -272,7 +273,7 @@ jobs:
 
   publish-release:
     name: Publish release
-    needs: [create-draft, run-unit-tests, run-e2e-tests, run-e2e-upgrade-tests, run-stress-tests]
+    needs: [create-draft, run-unit-tests, run-e2e-tests, run-e2e-upgrade-tests, run-stress-tests, run-e2e-upgrade-while-deleting-tests]
     if: ${{ !inputs.dry-run }}
     runs-on: ubuntu-latest
 
diff --git a/scripts/upload_assets.sh b/scripts/upload_assets.sh
index cd4ed7981..33578ea83 100755
--- a/scripts/upload_assets.sh
+++ b/scripts/upload_assets.sh
@@ -13,8 +13,8 @@ set -E          # needs to be set if we want the ERR trap
 set -o pipefail # prevents errors in a pipeline from being masked
 
 # Expected variables:
-#   PULL_BASE_REF - name of the tag
 #   BOT_GITHUB_TOKEN - github token used to upload the template yaml
+#   KYMA_BTP_MANAGER_REPO  - Kyma repository
 
 uploadFile() {
   filePath=${1}
@@ -37,7 +37,7 @@ uploadFile() {
 
 MANIFEST_FILE="./manifests/btp-operator/btp-manager.yaml"
 DEFAULT_CR_FILE="./examples/btp-operator.yaml"
-UPLOAD_URL="https://uploads.github.com/repos/kyma-project/btp-manager/releases/${RELEASE_ID}/assets"
+UPLOAD_URL="https://uploads.github.com/repos/${KYMA_BTP_MANAGER_REPO}/releases/${RELEASE_ID}/assets"
 
 echo -e "\n--- Updating GitHub release ${RELEASE_ID} with btp-manager.yaml and btp-operator-default-cr.yaml assets"