ci: fix pack binaries (databendlabs#17544)

everpcpc · web-flow · commit 5e4b98f21614 · 2025-03-04T09:33:31.000+08:00
diff --git a/.github/actions/pack_binaries/action.yml b/.github/actions/pack_binaries/action.yml
@@ -5,7 +5,7 @@ inputs:
     description: "Release target"
     required: true
   category:
-    description: "Release default/hdfs/udf/testsuite"
+    description: "Release default/hdfs/udf/testsuite/dbg"
     required: false
     default: default
   version:
@@ -15,14 +15,24 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Download artifact
+    - name: Download artifact for dbg
+      if: inputs.category == 'dbg'
       uses: ./.github/actions/artifact_download
       with:
         sha: ${{ github.sha }}
         target: ${{ inputs.target }}
-        category: ${{ inputs.category }}
+        category: default
         path: distro/bin
         artifacts: metactl,meta,query,query.debug
+    - name: Download artifact for others
+      if: inputs.category != 'dbg'
+      uses: ./.github/actions/artifact_download
+      with:
+        sha: ${{ github.sha }}
+        target: ${{ inputs.target }}
+        category: ${{ inputs.category }}
+        path: distro/bin
+        artifacts: metactl,meta,query
     - name: Get Latest BendSQL
       id: bendsql
       uses: pozetroninc/github-action-get-latest-release@master
@@ -53,7 +63,7 @@ runs:
         cp ./scripts/distribution/configs/databend-* distro/configs/
         cp ./scripts/distribution/release-readme.txt distro/readme.txt
         cp -r ./scripts/distribution/package-scripts/* distro/scripts/
-        tar -C ./distro --exclude='*.debug' -czvf ${pkg_name}.tar.gz bin configs systemd scripts readme.txt
+        tar -C ./distro -czvf ${pkg_name}.tar.gz bin configs systemd scripts readme.txt
         sha256sum ${pkg_name}.tar.gz >> sha256-${pkg_name}.txt
         echo "pkg_name=$pkg_name" >> $GITHUB_OUTPUT
     - name: post sha256
@@ -68,37 +78,3 @@ runs:
         name: ${{ steps.pack_binaries.outputs.pkg_name }}.tar.gz
         path: ${{ steps.pack_binaries.outputs.pkg_name }}.tar.gz
         retention-days: 1
-    - name: Pack DBG Binaries
-      id: pack_dbg_binaries
-      shell: bash
-      run: |
-        target=${{ inputs.target }}
-        version=${{ inputs.version }}
-        case ${{ inputs.category }} in
-          default)
-            pkg_name="databend-dbg-${version}-${target}"
-            ;;
-          *)
-          pkg_name="databend-dbg-${{ inputs.category }}-${version}-${target}"
-            ;;
-        esac
-        mkdir -p distro/{bin,configs,systemd,scripts}
-        cp ./scripts/distribution/systemd/databend-* distro/systemd/
-        cp ./scripts/distribution/configs/databend-* distro/configs/
-        cp ./scripts/distribution/release-readme.txt distro/readme.txt
-        cp -r ./scripts/distribution/package-scripts/* distro/scripts/
-        tar -C ./distro -czvf ${pkg_name}.tar.gz bin configs systemd scripts readme.txt
-        sha256sum ${pkg_name}.tar.gz >> sha256-${pkg_name}.txt
-        echo "pkg_name=$pkg_name" >> $GITHUB_OUTPUT
-    - name: post dbg sha256
-      uses: actions/upload-artifact@v4
-      with:
-        name: sha256sums-${{ inputs.category }}-${{ inputs.target }}-gdb
-        path: sha256-${{ steps.pack_dbg_binaries.outputs.pkg_name }}.txt
-        retention-days: 1
-    - name: post dbg binaries
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ steps.pack_dbg_binaries.outputs.pkg_name }}.tar.gz
-        path: ${{ steps.pack_dbg_binaries.outputs.pkg_name }}.tar.gz
-        retention-days: 1
diff --git a/.github/actions/pack_deb/action.yml b/.github/actions/pack_deb/action.yml
@@ -64,7 +64,7 @@ runs:
         export deb_version="${{ steps.info.outputs.deb_version }}"
         export deb_arch="${{ steps.info.outputs.deb_arch }}"
         pkg_name="databend-query_${deb_version}_${deb_arch}.deb"
-        nfpm pkg --packager deb -t "$pkg_name" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-query.yaml)
+        nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-query.yaml)
 
     - name: Build Databend Meta Package
       shell: bash
@@ -74,7 +74,7 @@ runs:
         export deb_version="${{ steps.info.outputs.deb_version }}"
         export deb_arch="${{ steps.info.outputs.deb_arch }}"
         pkg_name="databend-meta_${deb_version}_${deb_arch}.deb"
-        nfpm pkg --packager deb -t "$pkg_name" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-meta.yaml)
+        nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-meta.yaml)
 
     - name: Build Databend Debug Package
       shell: bash
@@ -84,7 +84,7 @@ runs:
         export deb_version="${{ steps.info.outputs.deb_version }}"
         export deb_arch="${{ steps.info.outputs.deb_arch }}"
         pkg_name="databend-query-dbg_${deb_version}_${deb_arch}.deb"
-        nfpm pkg --packager deb -t "$pkg_name" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-query-dbg.yaml)
+        nfpm pkg --packager deb -t "${path}/${pkg_name}" -f <(envsubst '${version} ${path} ${arch}' < scripts/distribution/nfpm-query-dbg.yaml)
 
     - name: Update release to github
       shell: bash
diff --git a/.github/actions/publish_binary/action.yml b/.github/actions/publish_binary/action.yml
@@ -23,7 +23,7 @@ runs:
           default)
             publish_name="databend-${{ inputs.version }}-${{ inputs.target }}"
             ;;
-          hdfs|udf|testsuite)
+          hdfs|udf|testsuite|dbg)
             publish_name="databend-${{ inputs.category }}-${{ inputs.version }}-${{ inputs.target }}"
             ;;
           *)
@@ -38,18 +38,12 @@ runs:
       # Reference: https://cli.github.com/manual/gh_release_upload
       run: |
         gh release upload ${{ inputs.version }} ${{ steps.name.outputs.name }}.tar.gz --clobber
-        if [ -f ${{ steps.name.outputs.name }}-dbg.tar.gz ]; then
-          gh release upload ${{ inputs.version }} ${{ steps.name.outputs.name }}-dbg.tar.gz --clobber
-        fi
 
     - name: Sync normal release to R2
       shell: bash
       if: inputs.category == 'default'
       run: |
         aws s3 cp ${{ steps.name.outputs.name }}.tar.gz s3://repo/databend/${{ inputs.version }}/${{ steps.name.outputs.name }}.tar.gz --no-progress --checksum-algorithm=CRC32
-        if [ -f ${{ steps.name.outputs.name }}-dbg.tar.gz ]; then
-          aws s3 cp ${{ steps.name.outputs.name }}-dbg.tar.gz s3://repo/databend/${{ inputs.version }}/${{ steps.name.outputs.name }}-dbg.tar.gz --no-progress --checksum-algorithm=CRC32
-        fi
         gh api /repos/databendlabs/databend/tags > tags.json
         aws s3 cp ./tags.json s3://repo/databend/tags.json --no-progress --checksum-algorithm=CRC32
         gh api /repos/databendlabs/databend/releases > releases.json
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -178,11 +178,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - category: default
-            target: x86_64-unknown-linux-gnu
-          - category: default
-            target: aarch64-unknown-linux-gnu
+        category:
+          - default
+          - dbg
+        target:
+          - x86_64-unknown-linux-gnu
+          - aarch64-unknown-linux-gnu
     steps:
       - name: Checkout
         uses: actions/checkout@v4
