From 491e2f8dba20a6a8ff8d84411a85055c5e9ca58e Mon Sep 17 00:00:00 2001
From: Dakshit Babbar <dakshba@amazon.com>
Date: Mon, 16 Dec 2024 17:30:58 +0530
Subject: [PATCH] Update Release Automation Workflow

---
 ...tag-and-zip.yml => release-automation.yml} | 36 ++++++++++++-
 .github/workflows/upload-release.yml          | 50 -------------------
 2 files changed, 34 insertions(+), 52 deletions(-)
 rename .github/workflows/{tag-and-zip.yml => release-automation.yml} (81%)
 delete mode 100644 .github/workflows/upload-release.yml

diff --git a/.github/workflows/tag-and-zip.yml b/.github/workflows/release-automation.yml
similarity index 81%
rename from .github/workflows/tag-and-zip.yml
rename to .github/workflows/release-automation.yml
index 393122ddea..49c4921426 100644
--- a/.github/workflows/tag-and-zip.yml
+++ b/.github/workflows/release-automation.yml
@@ -1,4 +1,4 @@
-name: Tag, Deploy Docs, and Create ZIP
+name: Release Automation
 
 on:
   workflow_dispatch:
@@ -58,7 +58,7 @@ jobs:
         env:
           VERSION_NUMBER: ${{ github.event.inputs.version_number }}
         run: |
-          zip -r aws-iot-device-sdk-embedded-C-$"VERSION_NUMBER".zip aws-iot-device-sdk-embedded-C -x "*.git*"
+          zip -r aws-iot-device-sdk-embedded-C-"$VERSION_NUMBER".zip aws-iot-device-sdk-embedded-C -x "*.git*"
           ls ./
       - name: Validate created ZIP
         env:
@@ -158,3 +158,35 @@ jobs:
               exit 1
             fi
           output_dir: html
+  create-release:
+    needs:
+      - create-zip
+      - deploy-docs
+    name: Create Release and Upload Release Asset
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.event.inputs.version_number }}
+          release_name: ${{ github.event.inputs.version_number }}
+          body: Release version ${{ github.event.inputs.version_number }} of the AWS IoT Device SDK for Embedded C.
+          draft: false
+          prerelease: false
+      - name: Download ZIP artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
+          asset_name: aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
+          asset_content_type: application/zip        
diff --git a/.github/workflows/upload-release.yml b/.github/workflows/upload-release.yml
deleted file mode 100644
index 36dd2ef2e6..0000000000
--- a/.github/workflows/upload-release.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: Create Release for Existing Tag
-
-on:
-  workflow_dispatch:
-    inputs:
-      workflow_name:
-        description: 'Name of workflow (file name) to obtain ZIP from'
-        default: tag-and-zip
-        required: false
-      workflow_id:
-        description: 'Workflow Run ID to obtain ZIP from'
-        required: true
-      version_number:
-        description: 'Tag Version Number (Eg, 202012.00) to release'
-        required: true
-
-jobs:
-  create-release:
-    name: Create Release and Upload Release Asset
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.event.inputs.version_number }}
-          release_name: ${{ github.event.inputs.version_number }}
-          body: Release version ${{ github.event.inputs.version_number }} of the AWS IoT Device SDK for Embedded C.
-          draft: false
-          prerelease: false
-      - name: Download ZIP artifact
-        uses: dawidd6/action-download-artifact@v6
-        with:
-          github_token: ${{secrets.GITHUB_TOKEN}}
-          # Required, workflow file name or ID
-          workflow: ${{ github.event.inputs.workflow_name }}.yml
-          run_id: ${{ github.event.inputs.workflow_id }}
-          name: aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
-          asset_name: aws-iot-device-sdk-embedded-C-${{ github.event.inputs.version_number }}.zip
-          asset_content_type: application/zip