From cfd1c078650ca769900a0eeae61b6f247bbafe07 Mon Sep 17 00:00:00 2001
From: Dylane Bengono <chaneldylanebengono@gmail.com>
Date: Thu, 29 Aug 2024 23:58:32 +0100
Subject: [PATCH] Refactor Snort package creation process

---
 .github/workflows/package-snort.yml | 63 ++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/package-snort.yml b/.github/workflows/package-snort.yml
index f2b677b..5da9279 100644
--- a/.github/workflows/package-snort.yml
+++ b/.github/workflows/package-snort.yml
@@ -1,4 +1,4 @@
-name: Build and Package Snort 3
+name: Build, Package, and Release Snort 3
 
 on:
   push:
@@ -37,47 +37,62 @@ jobs:
           mkdir -p /work/packages/$ARCH
           mv /work/*.deb /work/packages/$ARCH/
 
-      - name: Upload packages
+      - name: Upload packages as artifacts
         uses: actions/upload-artifact@v4
         with:
           name: snort3-packages-${{ matrix.arch }}
           path: /work/packages/${{ matrix.arch }}
 
-  release:
-    name: Create GitHub Release
+  deploy:
+    name: Create GitHub Release and Upload Assets
     runs-on: ubuntu-latest
     needs: build
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Create Release
-        id: create_release
+    steps:
+      - name: Create a release
+        id: release
         uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: v1.0.0
-          release_name: Release v1.0.0
+            tag_name: ${{ github.ref }}
+          release_name: Snort 3 Release
           draft: false
           prerelease: false
 
-      - name: Upload Release Asset (amd64)
+      - name: Create work directory
+        run: sudo mkdir -p /work && sudo chmod -R 777 /work
+
+      - name: Download amd64 packages
+        uses: actions/download-artifact@v4
+        with:
+          name: snort3-packages-amd64
+          path: /work/packages/amd64
+
+      - name: Download arm64 packages
+        uses: actions/download-artifact@v4
+        with:
+          name: snort3-packages-arm64
+          path: /work/packages/arm64
+
+      - name: List amd64 files
+        run: ls -l /work/packages/amd64/
+
+      - name: List arm64 files
+        run: ls -l /work/packages/arm64/
+
+      - name: Upload amd64 package to GitHub Release
         uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /work/packages/amd64/*.deb
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: /work/packages/amd64/snort3-amd64.deb
           asset_name: snort3-amd64.deb
           asset_content_type: application/octet-stream
 
-      - name: Upload Release Asset (arm64)
+      - name: Upload arm64 package to GitHub Release
         uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: /work/packages/arm64/*.deb
+          upload_url: ${{ steps.release.outputs.upload_url }}
+          asset_path: /work/packages/arm64/snort3-arm64.deb
           asset_name: snort3-arm64.deb
-          asset_content_type: application/octet-stream
\ No newline at end of file
+          asset_content_type: application/octet-stream