CHeckout repo for gh release, other fixes

VIewer app in docs/getting_started.rst
isl-org · May 3, 2024 · 25e5a6a · 25e5a6a
1 parent 7b169f8
commit 25e5a6a
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 32 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -103,11 +103,12 @@ jobs:
       - name: Build Open3D viewer app
         if: ${{ env.BUILD_SHARED_LIBS == 'OFF' }}
         run: |
+          OPEN3D_VERSION-FULL="$(grep -F OPEN3D_VERSION_FULL build/CMakeCache.txt | cut -f2 -d'=')"
           PATH=/usr/local/var/homebrew/linked/ccache/libexec:$PATH
           pushd build
           make -j${NPROC} Open3DViewer
           pushd bin
-          zip -rv open3d-app-macosx-10_15-${{ runner.arch }}.zip Open3D.app
+          zip -rv "open3d-${OPEN3D_VERSION_FULL}-app-macosx-10_15-${{ runner.arch }}.zip" Open3D.app
           ccache -s
 
       - name: Upload package
@@ -132,14 +133,16 @@ jobs:
         if: ${{ env.BUILD_SHARED_LIBS == 'OFF' }}
         with:
           name: open3d-app-macosx-10_15-${{ runner.arch}}
-          path: build/bin/open3d-app-macosx-10_15-${{ runner.arch }}.zip
+          path: build/bin/open3d-*-app-macosx-10_15-${{ runner.arch }}.zip
           if-no-files-found: error
 
   fuse-viewer:
     name: Fuse x64 and ARM64 viewer app
     runs-on: [macos-12]
     needs: [MacOS]
     steps:
+      - name: Checkout source code  # for gh release upload
+        uses: actions/checkout@v4
       - name: Download viewer apps
         uses: actions/download-artifact@v4
         with:
@@ -148,15 +151,16 @@ jobs:
 
       - name: Fuse x64 and arm64 viewer apps
         run: |
-          unzip open3d-app-macosx-10_15-X64.zip -d x64
-          unzip open3d-app-macosx-10_15-ARM64.zip -d arm64
+          unzip open3d-*-app-macosx-10_15-X64.zip -d x64
+          unzip open3d-*-app-macosx-10_15-ARM64.zip -d arm64
+          APP_NAME=$(ls open3d-*-app-macosx-10_15-X64.zip)
+          APP_NAME=${APP_NAME/-X64/-universal2}  # includes version
           for i in arm64/Open3D.app/Contents/MacOS/*; do
             filepath=Open3D.app/Contents/MacOS/$(basename $i)
             lipo -create arm64/${filepath} x64/${filepath} -output arm64/${filepath}
           done
           mv arm64/Open3D.app Open3D.app
-          OPEN3D_VERSION-FULL="$(grep -F OPEN3D_VERSION_FULL build/CMakeCache.txt | cut -f2 -d'=')"
-          zip -rv "open3d-${OPEN3D_VERSION_FULL}-app-macosx-10_15-universal2.zip" Open3D.app
+          zip -rv "${APP_NAME}" Open3D.app
 
       - name: Upload Open3D viewer app
         uses: actions/upload-artifact@v4
@@ -165,6 +169,8 @@ jobs:
           path: open3d-*-app-macosx-10_15-universal2.zip
           if-no-files-found: error
 
+      - name: Checkout source code
+        uses: actions/checkout@v4
       - name: Update viewer devel release
         if: ${{ github.ref == 'refs/heads/main' }}
         env:
@@ -296,6 +302,8 @@ jobs:
           - is_main: false
             python_version: '3.10'
     steps:
+      - name: Checkout source code  # for gh release upload
+        uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -186,7 +186,7 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          $Env:OPEN3D_VERSION_FULL = (Select-String -Path "build/CMakeCache.txt" -Pattern "OPEN3D_VERSION_FULL").Line.Split('=')[1]
+          $Env:OPEN3D_VERSION_FULL = (Select-String -Path "C:/Open3D/build/CMakeCache.txt" -Pattern "OPEN3D_VERSION_FULL").Line.Split('=')[1]
           Compress-Archive -Path C:\Program Files\Open3D\bin\Open3D -DestinationPath `
             "open3d-$Env:OPEN3D_VERSION_FULL-app-windows-amd64.zip"
           gh release upload main-devel open3d-app-windows-amd64.zip --clobber
@@ -314,7 +314,6 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
-          $PYTAG="-cp$(${{ env.python_version }} -replace '\.', '')"
           gh release upload main-devel ${{ env.BUILD_DIR }}/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }} --clobber
           gh release view main-devel
 

diff --git a/docs/getting_started.in.rst b/docs/getting_started.in.rst
@@ -5,6 +5,21 @@ Getting started
 
 .. _install_open3d_python:
 
+Viewer
+======
+
+Use the Open3D viewer application to visualize 3D data in various formats and
+interact with it.  You can download the latest stable release app from `Github
+releases <https://github.com/isl-org/Open3D/releases>`__. The latest development
+version (``HEAD`` of ``main`` branch) viewer app is provided here [#]_:
+
+* `Linux (Ubuntu 18.04+ or glibc 2.27+ [#]_) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-viewer-@[email protected]>`__
+* `MacOSX v10.15+ (Intel or Apple Silicon) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-app-macosx-10_15-universal2.zip>`__
+* `Windows 10+ (64-bit) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@[email protected]>`__
+
+.. [#] Please use these links from the `latest version of this page <https://www.open3d.org/docs/latest/getting_started.html>`__ only.
+.. [#] To check the `glibc` version on your system, run :code:`ldd --version`.
+
 Python
 ======
 
@@ -68,30 +83,31 @@ version (``HEAD`` of ``main`` branch):
 .. list-table::
     :stub-columns: 1
     :widths: auto
+   https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-manylinux_2_27_x86_64.whl
 
     * - Linux
-      - `Python 3.8 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.9 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.10 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.11 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.8 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.9 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.10 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.11 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-manylinux_2_27_x86_64.whl>`__
 
     * - Linux (CPU)
-      - `Python 3.8 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d_cpu-@OPEN3D_VERSION_FULL@-cp38-cp38-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.9 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d_cpu-@OPEN3D_VERSION_FULL@-cp39-cp39-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.10 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d_cpu-@OPEN3D_VERSION_FULL@-cp310-cp310-manylinux_2_27_x86_64.whl>`__
-      - `Python 3.11 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d_cpu-@OPEN3D_VERSION_FULL@-cp311-cp311-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.8 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d_cpu-@OPEN3D_VERSION_FULL@-cp38-cp38-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.9 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d_cpu-@OPEN3D_VERSION_FULL@-cp39-cp39-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.10 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d_cpu-@OPEN3D_VERSION_FULL@-cp310-cp310-manylinux_2_27_x86_64.whl>`__
+      - `Python 3.11 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d_cpu-@OPEN3D_VERSION_FULL@-cp311-cp311-manylinux_2_27_x86_64.whl>`__
 
     * - MacOS
-      - `Python 3.8 (x86_64) <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-macosx_11_0_x86_64.whl>`__
-      - `Python 3.9 (x86_64) <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-macosx_11_0_x86_64.whl>`__
-      - `Python 3.10 (x86_64+arm64) <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-macosx_11_0_universal2.whl>`__
-      - `Python 3.11 (x86_64+arm64) <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-macosx_10_15_universal2.whl>`__
+      - `Python 3.8 (x86_64) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-macosx_11_0_x86_64.whl>`__
+      - `Python 3.9 (x86_64) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-macosx_11_0_x86_64.whl>`__
+      - `Python 3.10 (x86_64+arm64) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-macosx_11_0_universal2.whl>`__
+      - `Python 3.11 (x86_64+arm64) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-macosx_10_15_universal2.whl>`__
 
     * - Windows
-      - `Python 3.8 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-win_amd64.whl>`__
-      - `Python 3.9 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-win_amd64.whl>`__
-      - `Python 3.10 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-win_amd64.whl>`__
-      - `Python 3.11 <https://storage.googleapis.com/open3d-releases/python-wheels/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-win_amd64.whl>`__
+      - `Python 3.8 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp38-cp38-win_amd64.whl>`__
+      - `Python 3.9 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp39-cp39-win_amd64.whl>`__
+      - `Python 3.10 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp310-cp310-win_amd64.whl>`__
+      - `Python 3.11 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-@OPEN3D_VERSION_FULL@-cp311-cp311-win_amd64.whl>`__
 
 Please use these links from the `latest version of this page
 <https://www.open3d.org/docs/latest/getting_started.html>`__ only. You can also
@@ -162,24 +178,24 @@ available for the main supported platforms. Also, the latest development version
     .. hlist::
         :columns: 2
 
-        * `x86_64 (CXX11 ABI) <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-linux-x86_64-cxx11-abi-@[email protected]>`__
-        * `x86_64 (CXX11 ABI) with CUDA 11.x <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-linux-x86_64-cxx11-abi-cuda-@[email protected]>`__
-        * `x86_64 (pre CXX11 ABI) <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-linux-x86_64-pre-cxx11-abi-@[email protected]>`__
-        * `x86_64 (pre CXX11 ABI) with CUDA 11.x <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-linux-x86_64-pre-cxx11-abi-cuda-@[email protected]>`__
+        * `x86_64 (CXX11 ABI) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-linux-x86_64-cxx11-abi-@[email protected]>`__
+        * `x86_64 (CXX11 ABI) with CUDA 11.x <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-linux-x86_64-cxx11-abi-cuda-@[email protected]>`__
+        * `x86_64 (pre CXX11 ABI) <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-linux-x86_64-pre-cxx11-abi-@[email protected]>`__
+        * `x86_64 (pre CXX11 ABI) with CUDA 11.x <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-linux-x86_64-pre-cxx11-abi-cuda-@[email protected]>`__
 
 :MacOSX v10.15+:
     .. hlist::
         :columns: 2
 
-        * `x86_64 <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-darwin-x86_64-@[email protected]>`__
-        * `arm64 <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-darwin-arm64-@[email protected]>`__
+        * `x86_64 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-darwin-x86_64-@[email protected]>`__
+        * `arm64 <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-darwin-arm64-@[email protected]>`__
 
 :Windows 10+:
     .. hlist::
         :columns: 2
 
-        * `x86_64 Release <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-windows-amd64-@[email protected]>`__
-        * `x86_64 Debug <https://storage.googleapis.com/open3d-releases/devel/open3d-devel-windows-amd64-@[email protected]>`__
+        * `x86_64 Release <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-windows-amd64-@[email protected]>`__
+        * `x86_64 Debug <https://github.com/isl-org/Open3D/releases/download/devel-main/open3d-devel-windows-amd64-@[email protected]>`__
 
 .. [#] Please use these links from the `latest version of this page <https://www.open3d.org/docs/latest/getting_started.html>`__
     only.