From 293d4c51f17cf11fe0762a59dbb624a233fdbb0c Mon Sep 17 00:00:00 2001
From: Luca Guerra <luca@guerra.sh>
Date: Wed, 3 May 2023 12:34:04 +0000
Subject: [PATCH] fix(ci): separate rpm/bin/bin-static/deb packages before
 publication, rename bin-static

Signed-off-by: Luca Guerra <luca@guerra.sh>
---
 .../workflows/reusable_build_packages.yaml    |  7 ++++-
 .../workflows/reusable_publish_packages.yaml  | 28 +++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/reusable_build_packages.yaml b/.github/workflows/reusable_build_packages.yaml
index deb5752f..1a8a1f0c 100644
--- a/.github/workflows/reusable_build_packages.yaml
+++ b/.github/workflows/reusable_build_packages.yaml
@@ -181,10 +181,15 @@ jobs:
         run: |
           cd build
           make -j6 package
+
+      - name: Rename static package
+        run: |
+          cd build
+          mv falco-${{ needs.fetch-version.outputs.version }}-x86_64.tar.gz falco-${{ needs.fetch-version.outputs.version }}-static-x86_64.tar.gz 
           
       - name: Upload Falco static package
         uses: actions/upload-artifact@v3
         with:
           name: falco-${{ needs.fetch-version.outputs.version }}-static-x86_64.tar.gz
           path: |
-            ${{ github.workspace }}/build/falco-*.tar.gz
+            ${{ github.workspace }}/build/falco-${{ needs.fetch-version.outputs.version }}-static-x86_64.tar.gz
diff --git a/.github/workflows/reusable_publish_packages.yaml b/.github/workflows/reusable_publish_packages.yaml
index 8d0b357c..8dc7f7fa 100644
--- a/.github/workflows/reusable_publish_packages.yaml
+++ b/.github/workflows/reusable_publish_packages.yaml
@@ -47,31 +47,31 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-x86_64.rpm
-          path: /tmp
+          path: /tmp/falco-rpm
 
       - name: Download RPM aarch64
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-aarch64.rpm
-          path: /tmp
+          path: /tmp/falco-rpm
 
       - name: Download binary x86_64
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-x86_64.tar.gz
-          path: /tmp
+          path: /tmp/falco-bin
 
       - name: Download binary aarch64
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-aarch64.tar.gz
-          path: /tmp
+          path: /tmp/falco-bin
 
       - name: Download static binary x86_64
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-static-x86_64.tar.gz
-          path: /tmp
+          path: /tmp/falco-bin-static
         
       - name: Import gpg key 
         env:
@@ -91,21 +91,21 @@ jobs:
           expect eof
           EOF
           chmod +x ~/sign
-          ~/sign /tmp/falco-*.rpm
-          rpm --qf %{SIGPGP:pgpsig} -qp /tmp/falco-*.rpm | grep SHA256
+          ~/sign /tmp/falco-rpm/falco-*.rpm
+          rpm --qf %{SIGPGP:pgpsig} -qp /tmp/falco-rpm/falco-*.rpm | grep SHA256
           
       - name: Publish rpm
         run: |
-          ./scripts/publish-rpm -f /tmp/falco-${{ inputs.version }}-x86_64.rpm -f /tmp/falco-${{ inputs.version }}-aarch64.rpm -r rpm${{ inputs.bucket_suffix }}
+          ./scripts/publish-rpm -f /tmp/falco-rpm/falco-${{ inputs.version }}-x86_64.rpm -f /tmp/falco-rpm/falco-${{ inputs.version }}-aarch64.rpm -r rpm${{ inputs.bucket_suffix }}
       
       - name: Publish bin
         run: |
-          ./scripts/publish-bin -f /tmp/falco-${{ inputs.version }}-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64
-          ./scripts/publish-bin -f /tmp/falco-${{ inputs.version }}-aarch64.tar.gz -r bin${{ inputs.bucket_suffix }} -a aarch64
+          ./scripts/publish-bin -f /tmp/falco-bin/falco-${{ inputs.version }}-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64
+          ./scripts/publish-bin -f /tmp/falco-bin/falco-${{ inputs.version }}-aarch64.tar.gz -r bin${{ inputs.bucket_suffix }} -a aarch64
           
       - name: Publish static
         run: |
-          ./scripts/publish-bin -f /tmp/falco-${{ inputs.version }}-static-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64
+          ./scripts/publish-bin -f /tmp/falco-bin-static/falco-${{ inputs.version }}-static-x86_64.tar.gz -r bin${{ inputs.bucket_suffix }} -a x86_64
           
   publish-packages-deb:
     runs-on: ubuntu-latest
@@ -132,13 +132,13 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-x86_64.deb
-          path: /tmp
+          path: /tmp/falco-deb
 
       - name: Download deb aarch64
         uses: actions/download-artifact@v3
         with:
           name: falco-${{ inputs.version }}-aarch64.deb
-          path: /tmp
+          path: /tmp/falco-deb
 
       - name: Import gpg key 
         env:
@@ -147,4 +147,4 @@ jobs:
           
       - name: Publish deb
         run: |
-          ./scripts/publish-deb -f /tmp/falco-${{ inputs.version }}-x86_64.deb -f /tmp/falco-${{ inputs.version }}-aarch64.deb -r deb${{ inputs.bucket_suffix }}
+          ./scripts/publish-deb -f /tmp/falco-deb/falco-${{ inputs.version }}-x86_64.deb -f /tmp/falco-deb/falco-${{ inputs.version }}-aarch64.deb -r deb${{ inputs.bucket_suffix }}