From 940eddb6d32575ea4a686656cec1727ad7bc239c Mon Sep 17 00:00:00 2001
From: Pawel Filipczak <pawel.filipczak@elastic.co>
Date: Mon, 20 Jan 2025 14:06:10 +0100
Subject: [PATCH] Improved release workflow to work with download/upload
 actions v4 (#1266)

---
 .github/workflows/build-packages.yml |  2 +-
 .github/workflows/release.yml        | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 9fd87c843..4f4fb8971 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -41,7 +41,7 @@ jobs:
         run: make -C packaging info
       - uses: actions/upload-artifact@v4
         with:
-          name: package-${{ matrix.BUILD_ARCH }}
+          name: packages-${{ matrix.BUILD_ARCH }}
           path: |
             build/packages/*
             !build/packages/**/*.sha512
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 63b6bc94a..8f874d9f3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -52,10 +52,19 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
+
+      - name: Download package artifacts
+        uses: actions/download-artifact@v4
         with:
-          pattern: package-*
+          pattern: packages-*
           path: ${{ env.BUILD_PACKAGES }}
+      - name: Moving packages out of folders
+        run: |
+          pushd ${{ env.BUILD_PACKAGES }}
+          find . -mindepth 2 -type f -exec mv -t . {} +
+          find . -mindepth 1 -maxdepth 1 -type d -exec rm -r {} +
+          popd
+          ls -R ${{ env.BUILD_PACKAGES }}
 
       - name: generate build provenance
         uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb  # v2.1.0