Skip to content

Commit

Permalink
GHA version updates
Browse files Browse the repository at this point in the history
uploaded artifacts must have unique names
  • Loading branch information
ssheorey committed Mar 25, 2024
1 parent 2328977 commit ce7fe3d
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
if: ${{ env.BUILD_SHARED_LIBS == 'ON' }}
uses: actions/upload-artifact@v4
with:
name: open3d-devel-macosx
name: ${{ env.DEVEL_PKG_NAME }}
path: build/package/${{ env.DEVEL_PKG_NAME }}
if-no-files-found: error

Expand Down Expand Up @@ -201,7 +201,7 @@ jobs:
- name: Upload wheel
uses: actions/upload-artifact@v4
with:
name: open3d_macosx_x86_64_wheels
name: ${{ env.PIP_PKG_NAME }}
path: build/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }}
if-no-files-found: error

Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
path: ${{ env.OPEN3D_ML_ROOT }}

- name: Download wheels
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
# See https://github.com/dawidd6/action-download-artifact for more
# flexible artifact download options
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
if: ${{ env.BUILD_PACKAGE == 'true' }}
uses: actions/upload-artifact@v4
with:
name: open3d-devel-linux-x86_64-cuda
name: open3d-devel-linux-x86_64-cuda-${CI_CONFIG}
path: open3d-devel-linux*.tar.xz
if-no-files-found: error

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ubuntu-sycl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
fi
- name: Docker test
run: |
du -hs $PWD
if [ "${{ matrix.BUILD_SHARED_LIBS }}" = "ON" ]; then
docker/docker_test.sh sycl-shared
else
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu-wheel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
- name: Upload wheel to GitHub artifacts
uses: actions/upload-artifact@v4
with:
name: open3d_linux_x86_64_wheels
name: ${{ env.PIP_PKG_NAME }}
path: |
${{ env.PIP_PKG_NAME }}
${{ env.PIP_CPU_PKG_NAME }}
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
repository: isl-org/Open3D-ML
path: ${{ env.OPEN3D_ML_ROOT }}
- name: Download wheels
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: open3d_linux_x86_64_wheels
- name: Set up Python
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
if: ${{ env.BUILD_SHARED_LIBS == 'ON' }}
uses: actions/upload-artifact@v4
with:
name: open3d-devel-linux-x86_64
name: open3d-devel-linux-x86_64-ML_${{ matrix.MLOPS }}
path: open3d-devel-*.tar.xz
if-no-files-found: error
- name: Upload viewer to GitHub artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/webrtc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Upload WebRTC
uses: actions/upload-artifact@v4
with:
name: webrtc_release
name: webrtc_release_${{ matrix.os }}
path: |
webrtc_*.tar.gz
checksum_*.txt
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Upload WebRTC
uses: actions/upload-artifact@v4
with:
name: webrtc_release
name: webrtc_release_windows
path: |
${{ env.WORK_DIR }}/webrtc_*.zip
${{ env.WORK_DIR }}/checksum_*.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ jobs:
if: ${{ matrix.BUILD_SHARED_LIBS == 'ON' && matrix.BUILD_CUDA_MODULE == 'OFF' }}
uses: actions/upload-artifact@v4
with:
name: open3d-devel-windows
name: ${{ env.DEVEL_PKG_NAME }}
path: ${{ env.BUILD_DIR }}/package/${{ env.DEVEL_PKG_NAME }}
if-no-files-found: error

Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup Windows SDK
uses: GuillaumeFalourd/setup-windows10-sdk-action@v1.11
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 19041

Expand Down Expand Up @@ -309,7 +309,7 @@ jobs:
- name: Upload wheel
uses: actions/upload-artifact@v4
with:
name: open3d_win_amd64_wheels
name: ${{ env.PIP_PKG_NAME }}
path: ${{ env.BUILD_DIR }}/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }}
if-no-files-found: error

Expand Down Expand Up @@ -363,7 +363,7 @@ jobs:
uses: actions/checkout@v4

- name: Download wheels
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
# See https://github.com/dawidd6/action-download-artifact for more
# flexible artifact download options
with:
Expand Down
4 changes: 4 additions & 0 deletions docker/docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ cuda_wheel_build() {
popd
if [ ! -z ${CI+x} ] ; then # Is CI env var set?
echo "[cuda_wheel_build()] Remove build cache to recover disk space..."
du -hs $PWD
docker builder prune --all --force
du -hs $PWD
fi

python_package_dir=/root/Open3D/build/lib/python_package
Expand Down Expand Up @@ -258,7 +260,9 @@ ci_build() {
popd
if [ ! -z ${CI+x} ] ; then # Is CI env var set?
echo "[ci_build()] Remove build cache to recover disk space..."
du -hs $PWD
docker builder prune --all --force
du -hs $PWD
fi

docker run -v "${PWD}:/opt/mount" --rm "${DOCKER_TAG}" \
Expand Down

0 comments on commit ce7fe3d

Please sign in to comment.