From 23de17a803a44d5081c2dac139d179cdd9b7b639 Mon Sep 17 00:00:00 2001
From: yash-zededa <yash@zededa.com>
Date: Mon, 28 Oct 2024 16:52:03 +0100
Subject: [PATCH 1/2] update: switch assets.yml to use GitHub API for artifact
 upload

Previous action for uploading artifacts to GitHub Releases failed due to
parallel (matrix) execution issues. Replaced it with direct GitHub API
calls to handle uploads.

This change provides more flexibility and control over artifact
management and release handling.

Added step to generate sha256 checksum for rootfs.img

Signed-off-by: yash-zededa <yash@zededa.com>
(cherry picked from commit e875d32dca80f81db11ec927be49d4ddd536755a)
(cherry picked from commit 75340228320cad4cf6ec71ba2aca44c643763d9e)
---
 .github/workflows/assets.yml | 62 ++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index 34388cbfaa..ad901387b8 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -20,6 +20,30 @@ on:  # yamllint disable-line rule:truthy
         type: string
 
 jobs:
+  create_release:
+    runs-on: ubuntu-latest
+    outputs:
+      release_id: ${{ steps.create_release.outputs.release_id }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    steps:
+      - name: Create GitHub Release
+        id: create_release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          response=$(curl -s -X POST \
+            -H "Authorization: Bearer $GITHUB_TOKEN" \
+            -H "Content-Type: application/json" \
+            -d '{
+              "tag_name": "${{ inputs.tag_ref }}",
+              "name": "${{ inputs.tag_ref }}",
+              "draft": false,
+              "prerelease": true
+            }' https://api.github.com/repos/${{ github.repository }}/releases)
+          release_id=$(echo "$response" | jq -r .id)
+          upload_url=$(echo "$response" | jq -r .upload_url | sed -e "s/{?name,label}//")
+          echo "release_id=$release_id" >> "$GITHUB_OUTPUT"
+          echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"
   build:
     runs-on: ubuntu-20.04
     strategy:
@@ -80,19 +104,29 @@ jobs:
           docker create --name eve_sources "$EVE_SOURCES" bash
           docker export --output assets/collected_sources.tar.gz eve_sources
           docker rm eve_sources
-      - name: Rename files for release
-        id: rename-files-for-release
-        run: |
-          for asset in assets/*; do
-            mv "$asset" "assets/${{ env.ARCH }}.$(basename "$asset")"
-          done
-      - name: Upload release files
-        id: upload-release-files
-        uses: softprops/action-gh-release@v2
+      - name: Create SHA256 checksum, rename, and upload files
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ inputs.tag_ref }}
-          make_latest: false
-          files: |
-            assets/${{ env.ARCH }}.*
+          RELEASE_ID: ${{ needs.create_release.outputs.release_id }}
+          UPLOAD_URL: ${{ needs.create_release.outputs.upload_url }}
+        run: |
+          # Create SHA256 checksum for rootfs.img
+          sha256sum "assets/rootfs.img" | awk '{ print $1 }' > "assets/rootfs.img.sha256"
+          for file in assets/*; do
+            base_name=$(basename "$asset")
+            # Add ARCH prefix
+            new_name="${ARCH}.${base_name}"
+            # Rename the file
+            mv "$asset" "assets/$new_name"
+            echo "Uploading assets/$new_name as $new_name..."
+            upload_response=$(curl -s -X POST \
+              -H "Authorization: Bearer $GITHUB_TOKEN" \
+              -H "Content-Type: application/octet-stream" \
+              --data-binary @"assets/$new_name" \
+              "$UPLOAD_URL?name=$new_name")
+            if echo "$upload_response" | jq -e .id > /dev/null; then
+              echo "$file_name uploaded successfully."
+            else
+              echo "Error uploading $file_name: $upload_response"
+            fi
+          done

From 43a12d0c54f4bfb5ac674b8bde27904d4a5ee9ea Mon Sep 17 00:00:00 2001
From: yash-zededa <yash@zededa.com>
Date: Thu, 31 Oct 2024 16:16:35 +0100
Subject: [PATCH 2/2] fix: assets upload to use the correct variable name.

Added needs on for the upload job to get the upload url from the create
release job.

Signed-off-by: yash-zededa <yash@zededa.com>
(cherry picked from commit a3fbdd9103f0933b0b8db0620f3b2ce94083e497)
---
 .github/workflows/assets.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/assets.yml b/.github/workflows/assets.yml
index ad901387b8..509f13e678 100644
--- a/.github/workflows/assets.yml
+++ b/.github/workflows/assets.yml
@@ -42,10 +42,12 @@ jobs:
             }' https://api.github.com/repos/${{ github.repository }}/releases)
           release_id=$(echo "$response" | jq -r .id)
           upload_url=$(echo "$response" | jq -r .upload_url | sed -e "s/{?name,label}//")
+          echo $upload_url
           echo "release_id=$release_id" >> "$GITHUB_OUTPUT"
           echo "upload_url=$upload_url" >> "$GITHUB_OUTPUT"
   build:
     runs-on: ubuntu-20.04
+    needs: create_release
     strategy:
       fail-fast: false
       matrix:
@@ -113,11 +115,11 @@ jobs:
           # Create SHA256 checksum for rootfs.img
           sha256sum "assets/rootfs.img" | awk '{ print $1 }' > "assets/rootfs.img.sha256"
           for file in assets/*; do
-            base_name=$(basename "$asset")
+            base_name=$(basename "$file")
             # Add ARCH prefix
             new_name="${ARCH}.${base_name}"
             # Rename the file
-            mv "$asset" "assets/$new_name"
+            mv "$file" "assets/$new_name"
             echo "Uploading assets/$new_name as $new_name..."
             upload_response=$(curl -s -X POST \
               -H "Authorization: Bearer $GITHUB_TOKEN" \