Skip to content

Commit 2c1c158

Browse files
ssheoreyssheorey
committed
Merge branch 'main' of https://github.com/isl-org/Open3D into realsense
2 parents 437dfdc + afb23f8 commit 2c1c158

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1655
-312
lines changed

‎.github/workflows/documentation.yml

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Documentation
2-
permissions:
3-
contents: write
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -21,8 +19,9 @@ concurrency:
2119
cancel-in-progress: true
2220

2321
jobs:
24-
headless-docs:
25-
# Build headless and docs
22+
headless-docs: # Build headless and docs
23+
permissions:
24+
contents: write # Artifact upload and release upload
2625
runs-on: ubuntu-latest # Warn about build issues in new versions
2726
env:
2827
OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
@@ -78,52 +77,25 @@ jobs:
7877
ccache -s
7978
source util/ci_utils.sh
8079
build_docs "$DEVELOPER_BUILD"
80+
# PWD: Open3D/docs
8181
ccache -s
82+
tar_file="open3d-${GITHUB_SHA}-docs.tar.gz"
83+
rm -rf "${GITHUB_WORKSPACE}/${tar_file}"
84+
# Docs in docs/_out/html
85+
tar -C _out -cvzf "${GITHUB_WORKSPACE}/${tar_file}" html
8286
8387
- name: Upload docs
8488
uses: actions/upload-artifact@v4
8589
with:
86-
name: open3d_docs
87-
path: docs/_out/html
90+
name: open3d-${{ github.sha }}-docs.tar.gz
91+
path: open3d-${{ github.sha }}-docs.tar.gz
8892
if-no-files-found: error
93+
compression-level: 0 # no compression
8994

90-
- name: Deploy docs if all artifacts available
95+
- name: Update devel release
9196
if: ${{ github.ref == 'refs/heads/main' }}
9297
env:
9398
GH_TOKEN: ${{ github.token }}
9499
run: |
95-
tar_file="open3d-${GITHUB_SHA}-docs.tar.gz"
96-
rm -rf ${tar_file}
97-
# Docs in docs/_out/html
98-
tar -C docs/_out -cvzf ${tar_file} html
99-
100-
echo "Waiting for other release assets..."
101-
this_sha=$(echo ${GITHUB_SHA} | cut -c 1-6)
102-
n_this_sha_assets=$(gh release view main-devel --json assets --jq ".assets | map(select(.name | contains(\"${this_sha}\"))) | length")
103-
# Total assets from each main branch commmit:
104-
# Python wheels (4x4) + Viewer (3) + C++ libs (4+2+2) = 27,
105-
while ((n_this_sha_assets < 27)); do
106-
sleep 60
107-
echo -n "."
108-
n_this_sha_assets=$(gh release view main-devel --json assets --jq ".assets | map(select(.name | contains(\"${this_sha}\"))) | length")
109-
done
110-
gh release upload main-devel ${tar_file} --clobber
111-
gh release view main-devel
112-
113-
echo "\nAll assets ready. Removing release assets except from last 3 commits: ${last_shas[@]}"
114-
release_assets=($(gh release view main-devel --json assets --jq '.assets[] | .name'))
115-
last_shas=($(git log --pretty=format:%h --abbrev-commit -n 3))
116-
for relass in "${release_assets[@]}"; do
117-
found=false
118-
for last_sha in "${last_shas[@]}"; do
119-
if [[ $relass == *${last_sha}* ]]; then
120-
found=true
121-
fi
122-
done
123-
if [ $found == false ]; then
124-
set -x
125-
gh release delete-asset main-devel $relass
126-
set +x
127-
fi
128-
done
100+
gh release upload main-devel open3d-${{ github.sha }}-docs.tar.gz --clobber
129101
gh release view main-devel

‎.github/workflows/macos.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: MacOS
2-
permissions:
3-
contents: write
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -28,6 +26,8 @@ env:
2826

2927
jobs:
3028
MacOS:
29+
permissions:
30+
contents: write # upload
3131
runs-on: ${{ matrix.os }}
3232
strategy:
3333
fail-fast: false
@@ -139,6 +139,8 @@ jobs:
139139
if-no-files-found: error
140140

141141
fuse-viewer:
142+
permissions:
143+
contents: write # Release upload
142144
name: Fuse x64 and ARM64 viewer app
143145
runs-on: [macos-12]
144146
needs: [MacOS]
@@ -182,6 +184,8 @@ jobs:
182184
183185
build-wheel:
184186
name: Build wheel
187+
permissions:
188+
contents: write # upload
185189
runs-on: ${{ matrix.os }}
186190
strategy:
187191
fail-fast: false
@@ -289,6 +293,8 @@ jobs:
289293

290294
fuse-wheel:
291295
name: Fuse universal2 wheel
296+
permissions:
297+
contents: write # Release upload
292298
runs-on: [macos-12]
293299
needs: [build-wheel]
294300
strategy:
@@ -354,6 +360,8 @@ jobs:
354360
355361
test-wheel:
356362
name: Test wheel
363+
permissions:
364+
contents: read
357365
runs-on: ${{ matrix.os }}
358366
needs: [build-wheel]
359367
strategy:

‎.github/workflows/style.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Style Check
2-
permissions:
3-
contents: read
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -17,6 +15,8 @@ concurrency:
1715

1816
jobs:
1917
style-check:
18+
permissions:
19+
contents: read
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout source code

‎.github/workflows/ubuntu-cuda.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Ubuntu CUDA
2-
permissions:
3-
contents: write
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -14,8 +12,7 @@ on:
1412
branches:
1513
- main
1614
pull_request:
17-
# Reduce CI frequency for paid CI.
18-
types: [review_requested]
15+
types: [opened, reopened, synchronize]
1916

2017
concurrency:
2118
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -30,6 +27,8 @@ jobs:
3027
skip-check:
3128
runs-on: ubuntu-latest
3229
name: Skip job for forks
30+
permissions:
31+
contents: read
3332
outputs:
3433
skip: ${{ steps.check.outputs.skip }}
3534
steps:
@@ -46,6 +45,8 @@ jobs:
4645
4746
build-and-run-docker:
4847
name: Build and run
48+
permissions:
49+
contents: write # upload
4950
runs-on: ubuntu-latest
5051
needs: [skip-check]
5152
if: needs.skip-check.outputs.skip == 'no'

‎.github/workflows/ubuntu-openblas.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
name: Ubuntu OpenBLAS
2-
permissions:
3-
contents: read
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
86
push:
97
branches:
108
- main
119
pull_request:
12-
# Reduce CI frequency for paid CI.
13-
types: [review_requested]
10+
types: [opened, reopened, synchronize]
1411

1512
concurrency:
1613
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -22,6 +19,8 @@ env:
2219

2320
jobs:
2421
openblas-amd64:
22+
permissions:
23+
contents: read
2524
runs-on: ubuntu-latest
2625
strategy:
2726
fail-fast: false
@@ -57,6 +56,8 @@ jobs:
5756
fi
5857
5958
openblas-arm64:
59+
permissions:
60+
contents: read
6061
runs-on: ubuntu-latest
6162
needs: [skip-arm64-check-on-fork]
6263
if: needs.skip-arm64-check-on-fork.outputs.skip == 'no'

‎.github/workflows/ubuntu-sycl.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Ubuntu SYCL
2-
permissions:
3-
contents: read
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -21,6 +19,8 @@ env:
2119

2220
jobs:
2321
ubuntu-sycl:
22+
permissions:
23+
contents: read
2424
runs-on: ubuntu-latest
2525
strategy:
2626
fail-fast: false

‎.github/workflows/ubuntu-wheel.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Ubuntu Wheel
2-
permissions:
3-
contents: write
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -28,6 +26,8 @@ env:
2826

2927
jobs:
3028
build-wheel:
29+
permissions:
30+
contents: write # Release upload
3131
name: Build wheel
3232
runs-on: ubuntu-latest
3333
strategy:
@@ -115,6 +115,8 @@ jobs:
115115
116116
test-wheel-cpu:
117117
name: Test wheel CPU
118+
permissions:
119+
contents: read
118120
runs-on: ubuntu-20.04
119121
needs: [build-wheel]
120122
strategy:

‎.github/workflows/ubuntu.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
name: Ubuntu
2-
permissions:
3-
contents: write
4-
actions: write
2+
permissions: {}
53

64
on:
75
workflow_dispatch:
@@ -25,6 +23,8 @@ env:
2523

2624
jobs:
2725
ubuntu:
26+
permissions:
27+
contents: write # Release upload
2828
runs-on: ubuntu-latest
2929
strategy:
3030
fail-fast: false

‎.github/workflows/update-release.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Clean release
2+
permissions: {}
3+
on:
4+
workflow_run: # Triggered when long running macos workflow ends
5+
workflows: [macos]
6+
types: [completed]
7+
# branches: [main]
8+
9+
jobs:
10+
clean-release:
11+
permissions:
12+
contents: write # Release upload
13+
env:
14+
GH_TOKEN: ${{ github.token }}
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Clean old release assets
19+
run: |
20+
# Total assets from each main branch commmit:
21+
# Python wheels (4x4) + Viewer (3) + C++ libs (4+2+2) = 27,
22+
release_assets=($(gh release view main-devel --json assets --jq '.assets[] | .name'))
23+
last_shas=($(git log --pretty=format:%h --abbrev-commit -n 3))
24+
echo "Removing release assets except from last 3 commits: ${last_shas[@]}"
25+
for relass in "${release_assets[@]}"; do
26+
found=false
27+
for last_sha in "${last_shas[@]}"; do
28+
if [[ $relass == *${last_sha}* ]]; then
29+
found=true
30+
fi
31+
done
32+
if [ $found == false ]; then
33+
set -x
34+
gh release delete-asset main-devel $relass
35+
set +x
36+
fi
37+
done
38+
gh release view main-devel

‎.github/workflows/vtk_packages.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: VTK Packages
2-
permissions:
3-
contents: write
2+
permissions: {}
43

54
on:
65
# Allows you to run this workflow manually from the Actions tab
@@ -9,6 +8,8 @@ on:
98
jobs:
109

1110
Linux:
11+
permissions:
12+
contents: write
1213
# TODO: Convert to docker
1314
runs-on: ubuntu-18.04
1415
steps:
@@ -34,6 +35,8 @@ jobs:
3435
if-no-files-found: error
3536

3637
Windows:
38+
permissions:
39+
contents: write
3740
runs-on: windows-2019
3841
env:
3942
SRC_DIR: "D:\\a\\open3d\\open3d"
@@ -84,6 +87,8 @@ jobs:
8487
if-no-files-found: error
8588

8689
MacOS:
90+
permissions:
91+
contents: write
8792
runs-on: macos-12
8893
strategy:
8994
fail-fast: false

0 commit comments

Comments
 (0)