Update Debian package naming and CI logic

- Used the same name format for the Debian package to differentiate between different build options. - Added logic to copy the Debian package (if generated) to the root directory. - Updated CI pipeline to upload the generated Debian package as artifact. Signed-off-by: Meet Gandhi <[email protected]>
isl-org · Sep 28, 2024 · 7c72d38 · 7c72d38
1 parent 4192cdb
commit 7c72d38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -79,6 +79,12 @@ jobs:
           name: open3d-devel-linux-x86_64-ML_${{ matrix.MLOPS }}
           path: open3d-devel-*.tar.xz
           if-no-files-found: error
+      - name: Upload Debian package to GitHub artifacts (if exist)
+        uses: actions/upload-artifact@v4
+        with:
+          name: open3d-debian
+          path: open3d-devel*.deb
+          if-no-files-found: ignore
       - name: Upload viewer to GitHub artifacts
         if: ${{ env.BUILD_SHARED_LIBS == 'OFF' }}
         uses: actions/upload-artifact@v4

diff --git a/cmake/Open3DPackaging.cmake b/cmake/Open3DPackaging.cmake
@@ -35,7 +35,6 @@ set(CPACK_THREADS 0)  # Use all cores for compressing package
 
 if (BUILD_DEBIAN_PACKAGE)
     list(APPEND CPACK_GENERATOR DEB)
-    set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
     set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
 endif()
 

diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci
@@ -222,7 +222,7 @@ RUN ccache -s \
  && CCACHE_DIR_PARENT=$(dirname ${CCACHE_DIR}) \
  && cd ${CCACHE_DIR_PARENT} \
  && tar -czf /${CCACHE_TAR_NAME}.tar.gz ${CCACHE_DIR_NAME} \
- && if [ "${PACKAGE}" = "ON" ]; then mv /root/Open3D/build/package/open3d-devel*.tar.xz /; fi \
+ && if [ "${PACKAGE}" = "ON" ]; then mv /root/Open3D/build/package/open3d-devel*.{tar.xz,deb} /; fi \
  && if [ "${PACKAGE}" = "VIEWER" ]; then mv /root/Open3D/build/package-Open3DViewer-deb/open3d-viewer-*-Linux.deb /; fi \
  && ls -alh /