Skip to content

Commit c9a56b1

Browse files
committed
Ubuntu 24.04 for wheel test
Test cmake symlink instead of copy
1 parent babbd7a commit c9a56b1

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/ubuntu-wheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
name: Test wheel CPU
124124
permissions:
125125
contents: read
126-
runs-on: ubuntu-20.04
126+
runs-on: ubuntu-22.04
127127
needs: [build-wheel]
128128
strategy:
129129
fail-fast: false

docker/Dockerfile.ci

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
113113
ENV PATH=${HOME}/${CMAKE_VERSION}/bin:${PATH}
114114
RUN CMAKE_VERSION_NUMBERS=$(echo "${CMAKE_VERSION}" | cut -d"-" -f2) \
115115
&& wget -q https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION_NUMBERS}/${CMAKE_VERSION}.tar.gz \
116-
&& tar -xf ${CMAKE_VERSION}.tar.gz \
117-
&& cp -ar ${CMAKE_VERSION} ${HOME} \
116+
&& tar -xf ${CMAKE_VERSION}.tar.gz -C ${HOME} \
118117
&& cmake --version
119118

120119
# Dependencies: ccache
@@ -189,6 +188,9 @@ RUN mkdir -p /etc/apt/keyrings \
189188
&& npm install -g yarn \
190189
&& yarn --version
191190

191+
192+
# Use symlink install to save space in CI
193+
ENV CMAKE_INSTALL_MODE=${CI:+SYMLINK}
192194
# Build all
193195
RUN \
194196
if [ "${BUILD_SYCL_MODULE}" = "ON" ]; then \
@@ -229,10 +231,10 @@ RUN \
229231
-DCMAKE_INSTALL_PREFIX=~/open3d_install \
230232
.. \
231233
&& make VERBOSE=1 -j$(nproc) \
232-
&& make install-pip-package -j$(nproc) \
234+
&& env CMAKE_INSTALL_MODE=COPY make install-pip-package -j$(nproc) \
233235
&& make install -j$(nproc) \
234-
&& if [[ "${PACKAGE}" = "ON" ]]; then make package; fi \
235-
&& if [[ "${PACKAGE}" = "VIEWER" ]]; then make package-Open3DViewer-deb; fi \
236+
&& if [[ "${PACKAGE}" = "ON" ]]; then env CMAKE_INSTALL_MODE=COPY make package; fi \
237+
&& if [[ "${PACKAGE}" = "VIEWER" ]]; then env CMAKE_INSTALL_MODE=COPY make package-Open3DViewer-deb; fi \
236238
&& if [[ "${CI:-}a" != "a" ]]; then rm -rf _deps assimp embree ipp mkl mkl_install webrtc librealsense; fi
237239
# If CI is not null or unset, remove all large build folders to save disk space
238240

0 commit comments

Comments
 (0)