simplify naming and structure for release archives

Author: orsinium

.github/workflows/build.yml

@@ -118,12 +118,11 @@ jobs:
         shell: bash
         run: |
           PKG_suffix=".tar.gz" ; case ${{ matrix.job.target }} in *-pc-windows-*) PKG_suffix=".zip" ;; esac;
-          PKG_BASENAME=${{ needs.crate_metadata.outputs.name }}-v${{ needs.crate_metadata.outputs.version }}-${{ matrix.job.target }}
-          PKG_NAME=${PKG_BASENAME}${PKG_suffix}
+          PKG_NAME="firefly_cli-${{ matrix.job.target }}${PKG_suffix}"
           echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_OUTPUT
 
           PKG_STAGING="${{ env.CICD_INTERMEDIATES_DIR }}/package"
-          ARCHIVE_DIR="${PKG_STAGING}/${PKG_BASENAME}/"
+          ARCHIVE_DIR="${PKG_STAGING}/"
           mkdir -p "${ARCHIVE_DIR}"
 
           # Binary
@@ -132,8 +131,8 @@ jobs:
           # base compressed package
           pushd "${PKG_STAGING}/" >/dev/null
           case ${{ matrix.job.target }} in
-            *-pc-windows-*) 7z -y a "${PKG_NAME}" "${PKG_BASENAME}"/* | tail -2 ;;
-            *) tar czf "${PKG_NAME}" "${PKG_BASENAME}"/* ;;
+            *-pc-windows-*) 7z -y a "${PKG_NAME}" ./* | tail -2 ;;
+            *) tar czf "${PKG_NAME}" ./* ;;
           esac;
           popd >/dev/null
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "firefly_cli"
-version = "0.15.5"
+version = "0.15.6"
 rust-version = "1.91.0"
 edition = "2024"
 authors = ["Firefly Zero team"]