From 924554aa4a3104d6bbe488aff42e3f0945b2283b Mon Sep 17 00:00:00 2001
From: Varik Matevosyan <varikmatevosyan@gmail.com>
Date: Sun, 20 Oct 2024 17:29:35 +0400
Subject: [PATCH] fix CI packaging

---
 .github/workflows/build.yaml    | 6 ------
 ci/scripts/universal-package.sh | 2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7b77164b..9bfd0075 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -92,9 +92,6 @@ jobs:
           pattern: lantern-extras-*.tar
           merge-multiple: true
           path: /tmp/lantern-extras-package
-      - uses: geekyeggo/delete-artifact@v4
-        with:
-          name: lantern-extras*.tar
       - uses: actions/download-artifact@v4
         with:
           pattern: lantern-cli-*
@@ -105,9 +102,6 @@ jobs:
           pattern: lantern-*.tar
           merge-multiple: true
           path: /tmp/lantern-package
-      - uses: geekyeggo/delete-artifact@v4
-        with:
-          name: lantern-*.tar
       - name: Create universal package
         id: package
         run: sudo sh -c "GITHUB_OUTPUT=$GITHUB_OUTPUT PACKAGE_EXTRAS=1 GITHUB_TOKEN=$GITHUB_TOKEN ./ci/scripts/universal-package.sh"
diff --git a/ci/scripts/universal-package.sh b/ci/scripts/universal-package.sh
index 25f15b4a..aff8b166 100755
--- a/ci/scripts/universal-package.sh
+++ b/ci/scripts/universal-package.sh
@@ -43,6 +43,8 @@ package_extension
 rm -rf $PACKAGE_DIR
 
 PACKAGE_DIR=/tmp/lantern-package
+rm -rf $PACKAGE_DIR/lantern-extras* || true
+rm -rf $PACKAGE_DIR/lantern-cli* || true
 PACKAGE_VERSION=$(ls -t $PACKAGE_DIR | head -1 | sed -E "s#lantern-(.*)-postgres.*#\1#")
 PACKAGE_NAME=lantern-${PACKAGE_VERSION}
 OUTPUT_DIR=/tmp/$PACKAGE_NAME