Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ubuntu24 ci #765

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,23 @@ jobs:
ubuntu_22_04_x86_64:
imageName: 'ubuntu-22.04'

ubuntu_24_04_x86_64:
imageName: 'ubuntu-24.04'

ubuntu_22_04_x86_64_offline:
imageName: 'ubuntu-22.04'
EXTRA_CMAKE_FLAGS: "-DWITH_OFFLINE=on"

#IMX
ubuntu_20_04_imx:
imageName: 'ubuntu-20.04'
DOCKER: "septimiuvana/tof-imx8-docker"
DOCKER: "septimiuvana/arm64-ubuntu"
EXTRA_CMAKE_FLAGS: "-DNXP=1"

#NVIDIA
ubuntu_20_04_nvidia:
imageName: 'ubuntu-20.04'
DOCKER: "adismartcamtest/tof_nvidia:4.0"
DOCKER: "septimiuvana/arm64-ubuntu"
EXTRA_CMAKE_FLAGS: "-DNVIDIA=1"

#code quality, TO DO: once entire code is formatted enable clang-format
Expand Down Expand Up @@ -125,18 +128,18 @@ jobs:
- task: UsePythonVersion@0
inputs:
versionSpec: '3.9'
- task: Cache@2
inputs:
key: deps_windows | "$(imageName)"
restoreKeys: deps_windows | "$(imageName)"
path: $(Agent.BuildDirectory)/s/deps_installed
cacheHitVar: CACHE_RESTORED
- task: PowerShell@2
inputs:
targetType: 'filePath'
filePath: ./ci/azure/windows-build/install_deps.ps1
condition: eq(variables.CACHE_RESTORED, 'false')
displayName: "Install Dependencies"
# - task: Cache@2
# inputs:
# key: deps_windows | "$(imageName)"
# restoreKeys: deps_windows | "$(imageName)"
# path: $(Agent.BuildDirectory)/s/deps_installed
# cacheHitVar: CACHE_RESTORED
# - task: PowerShell@2
# inputs:
# targetType: 'filePath'
# filePath: ./ci/azure/windows-build/install_deps.ps1
# condition: eq(variables.CACHE_RESTORED, 'false')
# displayName: "Install Dependencies"
- task: PowerShell@2
inputs:
targetType: 'filePath'
Expand Down
8 changes: 4 additions & 4 deletions ci/azure/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ deps_default() {
pushd ${BUILD_DIR}

get_deps_source_code "${DEPS_DIR}"
build_and_install_glog "${DEPS_DIR}/glog" "${DEPS_DIR}/installed/glog"
build_and_install_protobuf "${DEPS_DIR}/protobuf" "${DEPS_DIR}/installed/protobuf"
build_and_install_websockets "${DEPS_DIR}/libwebsockets" "${DEPS_DIR}/installed/websockets"
build_and_install_opencv "${DEPS_DIR}/opencv-${OPENCV}" "${DEPS_DIR}/installed/opencv"
# build_and_install_glog "${DEPS_DIR}/glog" "${DEPS_DIR}/installed/glog"
# build_and_install_protobuf "${DEPS_DIR}/protobuf" "${DEPS_DIR}/installed/protobuf"
# build_and_install_websockets "${DEPS_DIR}/libwebsockets" "${DEPS_DIR}/installed/websockets"
# build_and_install_opencv "${DEPS_DIR}/opencv-${OPENCV}" "${DEPS_DIR}/installed/opencv"

if [[ ${CMAKE_OPTIONS} == *"WITH_OPEN3D=on"* ]]; then
build_and_install_open3d "${DEPS_DIR}/Open3D" "${DEPS_DIR}/installed/Open3D"
Expand Down
18 changes: 9 additions & 9 deletions ci/azure/lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -279,17 +279,17 @@ get_deps_source_code() {
export OPENCV="3.4.1"
fi

[ -d "glog" ] || {
git clone --branch v0.6.0 --depth 1 https://github.com/google/glog
}
# [ -d "glog" ] || {
# git clone --branch v0.6.0 --depth 1 https://github.com/google/glog
# }

[ -d "protobuf" ] || {
git clone --branch v3.9.0 --depth 1 https://github.com/protocolbuffers/protobuf
}
# [ -d "protobuf" ] || {
# git clone --branch v3.9.0 --depth 1 https://github.com/protocolbuffers/protobuf
# }

[ -d "libwebsockets" ] || {
git clone --branch v3.1-stable --depth 1 https://github.com/warmcat/libwebsockets
}
# [ -d "libwebsockets" ] || {
# git clone --branch v3.1-stable --depth 1 https://github.com/warmcat/libwebsockets
# }

[ -d "opencv-${OPENCV}" ] || {
curl -sL https://github.com/Itseez/opencv/archive/${OPENCV}.zip > opencv.zip
Expand Down
2 changes: 1 addition & 1 deletion ci/azure/run_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ build_default() {
# setup more deps
# TODO cache this
sudo apt-get update
sudo apt-get install -y build-essential libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libgl1-mesa-dev libglfw3-dev
sudo apt-get install -y build-essential libgtk2.0-dev pkg-config libavcodec-dev libavformat-dev libswscale-dev libgl1-mesa-dev libglfw3-dev libopencv-dev

sudo sh -c 'echo "${DEPS_DIR}/installed/opencv/lib" > /etc/ld.so.conf.d/opencv.conf'
sudo ldconfig
Expand Down
7 changes: 6 additions & 1 deletion doc/itof/linux_build_instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@
#### Installing the pre-requisites
```console
sudo apt update
sudo apt install cmake g++ python3.8-dev \
sudo apt install cmake g++ \
libopencv-contrib-dev libopencv-dev \
libgl1-mesa-dev libglfw3-dev \
doxygen graphviz
```

For Linux builds install the necessary version of Python dev libraries. For example for Ubuntu 24.04 with Python 3.12 as the default Python:
```console
sudo apt install python3.12-dev
```

### Building the SDK with Example

Please note, ensure you are using the intended branch.
Expand Down