Skip to content

Commit 3550f4e

Browse files
authored
Fix Ubuntu CI (#7319)
Node 16 -> Node 18
1 parent 1c48fcd commit 3550f4e

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.github/workflows/ubuntu-wheel.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
env:
4747
DEVELOPER_BUILD: ${{ github.event.inputs.developer_build || 'ON' }}
4848
PYTHON_VERSION: ${{ matrix.python_version }}
49-
CCACHE_TAR_NAME: open3d-ubuntu-2004-cuda-ci-ccache
49+
CCACHE_TAR_NAME: open3d-ubuntu-2204-cuda-ci-ccache
5050
OPEN3D_CPU_RENDERING: true
5151
steps:
5252
- name: Checkout source code
@@ -90,6 +90,14 @@ jobs:
9090
${{ env.PIP_PKG_NAME }}
9191
${{ env.PIP_CPU_PKG_NAME }}
9292
if-no-files-found: error
93+
- name: Update devel release
94+
if: ${{ github.ref == 'refs/heads/main' }}
95+
env:
96+
GH_TOKEN: ${{ github.token }}
97+
run: |
98+
gh release upload main-devel ${GITHUB_WORKSPACE}/${{ env.PIP_PKG_NAME }} \
99+
${GITHUB_WORKSPACE}/${{ env.PIP_CPU_PKG_NAME }} --clobber
100+
gh release view main-devel
93101
- name: GCloud CLI auth
94102
if: ${{ github.ref == 'refs/heads/main' }}
95103
uses: 'google-github-actions/auth@v2'
@@ -106,14 +114,6 @@ jobs:
106114
if: ${{ github.ref == 'refs/heads/main' }}
107115
run: |
108116
gsutil cp ${GITHUB_WORKSPACE}/${{ env.CCACHE_TAR_NAME }}.tar.xz gs://open3d-ci-cache/
109-
- name: Update devel release
110-
if: ${{ github.ref == 'refs/heads/main' }}
111-
env:
112-
GH_TOKEN: ${{ github.token }}
113-
run: |
114-
gh release upload main-devel ${GITHUB_WORKSPACE}/${{ env.PIP_PKG_NAME }} \
115-
${GITHUB_WORKSPACE}/${{ env.PIP_CPU_PKG_NAME }} --clobber
116-
gh release view main-devel
117117
118118
test-wheel-cpu:
119119
name: Test wheel CPU

.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
- name: Set up Python version
9999
uses: actions/setup-python@v5
100100
with:
101-
python-version: '3.10'
101+
python-version: '3.12'
102102

103103
- name: Checkout Open3D-ML
104104
uses: actions/checkout@v4
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
if ( '${{ matrix.BUILD_CUDA_MODULE }}' -eq 'ON' ) {
113113
# python -m pip install -r open3d_ml/requirements-torch-cuda.txt
114-
python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu124
114+
python -m pip install torch torchvision --index-url https://download.pytorch.org/whl/cu126
115115
} else {
116116
python -m pip install -r open3d_ml/requirements-torch.txt
117117
}

3rdparty/webrtc/Dockerfile.webrtc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# - docker run --rm --entrypoint cat open3d-webrtc:abi1 \
1414
# webrtc_60e6748_cxx-abi-1.tar.gz > webrtc_60e6748_cxx-abi-1.tar.gz
1515

16-
FROM ubuntu:20.04
16+
FROM ubuntu:22.04
1717

1818
ARG SUDO=command
1919
COPY 3rdparty/webrtc 3rdparty/webrtc

docker/Dockerfile.ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ RUN source util/ci_utils.sh \
165165
RUN mkdir -p /etc/apt/keyrings \
166166
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
167167
| gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
168-
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x nodistro main" \
168+
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" \
169169
| tee /etc/apt/sources.list.d/nodesource.list \
170170
&& apt-get update \
171171
&& apt-get install -y nodejs \

docker/Dockerfile.wheel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# FROM must be called before other ARGS except for ARG BASE_IMAGE
2-
ARG BASE_IMAGE=nvidia/cuda:12.1.0-cudnn8-devel-ubuntu20.04
2+
ARG BASE_IMAGE=nvidia/cuda:12.6.3-cudnn-devel-ubuntu22.04
33
FROM ${BASE_IMAGE}
44

55
# Customizable build arguments from cuda.yml
@@ -119,7 +119,7 @@ RUN source /root/Open3D/util/ci_utils.sh \
119119
&& install_python_dependencies with-jupyter
120120

121121
# Open3D Jupyter dependencies
122-
RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
122+
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
123123
&& apt-get install -y nodejs \
124124
&& rm -rf /var/lib/apt/lists/* \
125125
&& node --version

0 commit comments

Comments
 (0)