Skip to content

Commit c535276

Browse files
committed
[ci] Update dependencies image for Linux and replace CentOS7 by Ubuntu22
1 parent 7a84e84 commit c535276

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
build-linux:
2323
runs-on: ubuntu-latest
2424
container:
25-
image: alicevision/alicevision-deps:2024.10.22-ubuntu20.04-cuda11.3.1
25+
image: alicevision/alicevision-deps:2024.11.25-ubuntu22.04-cuda12.1.0
2626
env:
2727
DEPS_INSTALL_DIR: /opt/AliceVision_install
2828
BUILD_TYPE: Release
@@ -45,26 +45,23 @@ jobs:
4545
run: |
4646
cmake .. \
4747
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
48-
-DBUILD_SHARED_LIBS:BOOL=ON \
48+
-DBUILD_SHARED_LIBS=ON \
4949
-DCMAKE_PREFIX_PATH="${DEPS_INSTALL_DIR}" \
50-
-DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../AV_install \
50+
-DCMAKE_INSTALL_PREFIX="${ALICEVISION_ROOT}" \
5151
-DTARGET_ARCHITECTURE=core \
52-
-DALICEVISION_BUILD_TESTS:BOOL=ON \
53-
-DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \
54-
-DALICEVISION_USE_OPENCV:BOOL=ON \
55-
-DALICEVISION_USE_CUDA:BOOL=ON \
56-
-DALICEVISION_USE_CCTAG:BOOL=ON \
57-
-DALICEVISION_USE_POPSIFT:BOOL=ON \
58-
-DALICEVISION_USE_ALEMBIC:BOOL=ON \
59-
-DOpenCV_DIR:PATH="${DEPS_INSTALL_DIR}/share/OpenCV" \
60-
-DALICEVISION_USE_OPENGV:BOOL=ON \
61-
-DOPENGV_DIR:PATH="${DEPS_INSTALL_DIR}" \
62-
-DBOOST_NO_CXX11:BOOL=ON \
63-
-DCeres_DIR:PATH="${DEPS_INSTALL_DIR}/share/Ceres" \
64-
-DEIGEN_INCLUDE_DIR_HINTS:PATH="${DEPS_INSTALL_DIR}" \
65-
-DAlembic_DIR:PATH="${DEPS_INSTALL_DIR}/lib/cmake/Alembic" \
66-
-DSWIG_DIR:PATH="${DEPS_INSTALL_DIR}/share/swig/4.3.0" \
67-
-DSWIG_EXECUTABLE:PATH="${DEPS_INSTALL_DIR}/bin-deps/swig"
52+
-DALICEVISION_BUILD_TESTS=ON \
53+
-DALICEVISION_BUILD_SWIG_BINDING=ON \
54+
-DALICEVISION_USE_OPENCV=ON \
55+
-DALICEVISION_USE_CUDA=ON \
56+
-DALICEVISION_USE_CCTAG=ON \
57+
-DALICEVISION_USE_POPSIFT=ON \
58+
-DALICEVISION_USE_ALEMBIC=ON \
59+
-DOpenCV_DIR="${DEPS_INSTALL_DIR}/share/OpenCV" \
60+
-DALICEVISION_USE_OPENGV=ON \
61+
-DCeres_DIR="${DEPS_INSTALL_DIR}/share/Ceres" \
62+
-DAlembic_DIR="${DEPS_INSTALL_DIR}/lib/cmake/Alembic" \
63+
-DSWIG_DIR="${DEPS_INSTALL_DIR}/share/swig/4.3.0" \
64+
-DSWIG_EXECUTABLE="${DEPS_INSTALL_DIR}/bin-deps/swig"
6865
6966
- name: Build
7067
working-directory: ./build
@@ -79,6 +76,7 @@ jobs:
7976
- name: Unit Tests
8077
working-directory: ./build
8178
run: |
79+
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
8280
make test
8381
8482
- name: Build As Third Party
@@ -123,8 +121,8 @@ jobs:
123121
export LD_LIBRARY_PATH=${ALICEVISION_ROOT}/lib:${ALICEVISION_ROOT}/lib64:${DEPS_INSTALL_DIR}/lib64:${DEPS_INSTALL_DIR}/lib:${LD_LIBRARY_PATH}
124122
echo "ldd aliceVision_cameraInit"
125123
ldd ${ALICEVISION_ROOT}/bin/aliceVision_cameraInit
126-
python --version
127-
python EvaluationLauncher.py -s ${ALICEVISION_ROOT}/bin -i $PWD/Benchmarking_Camera_Calibration_2008/ -o $PWD/reconstructions/ -r $PWD/results.json -v
124+
python3 --version
125+
python3 EvaluationLauncher.py -s ${ALICEVISION_ROOT}/bin -i $PWD/Benchmarking_Camera_Calibration_2008/ -o $PWD/reconstructions/ -r $PWD/results.json -v
128126
129127
- name: Python Binding - Unit Tests
130128
run: |

0 commit comments

Comments
 (0)