diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml index 067479ef6..23336b4c6 100644 --- a/.github/workflows/build_test.yml +++ b/.github/workflows/build_test.yml @@ -8,7 +8,7 @@ on: env: GTEST_OUTPUT: "xml:test_results" - BUILDCMD: "colcon build --event-handlers console_direct+ --executor sequential --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION} -DPYTHON_PACKAGE_FOLDER_NAME=${PYTHON_PACKAGE_FOLDER_NAME} && colcon test --event-handlers console_direct+ --packages-select ad_map_access ad_physics && colcon test-result" + BUILDCMD: "colcon build --event-handlers console_direct+ --executor sequential --cmake-args -DBUILD_HARDENING=ON -DBUILD_TESTING=ON -DBUILD_PYTHON_BINDING=ON -DPYTHON_BINDING_VERSION=${PYTHON_BINDING_VERSION} && colcon test --event-handlers console_direct+ --packages-select ad_map_access ad_physics && colcon test-result" permissions: contents: read @@ -24,27 +24,23 @@ jobs: CC: /usr/bin/clang-10 CXX: /usr/bin/clang++-10 PYTHON_BINDING_VERSION: "3.10" - PYTHON_PACKAGE_FOLDER_NAME: "site-packages" - os: ubuntu-22.04 compiler: gcc11 EXTRA_PACKAGES: "" CC: "" CXX: "" PYTHON_BINDING_VERSION: "3.10" - PYTHON_PACKAGE_FOLDER_NAME: "site-packages" - os: ubuntu-22.04 compiler: clang14 EXTRA_PACKAGES: clang-14 CC: /usr/bin/clang-14 CXX: /usr/bin/clang++-14 PYTHON_BINDING_VERSION: "3.10" - PYTHON_PACKAGE_FOLDER_NAME: "site-packages" name: ${{ matrix.os }}, ${{ matrix.compiler }}, python-${{ matrix.PYTHON_BINDING_VERSION }} runs-on: ${{ matrix.os }} env: PYTHON_BINDING_VERSION: ${{ matrix.PYTHON_BINDING_VERSION }} - PYTHON_PACKAGE_FOLDER_NAME: ${{ matrix.PYTHON_PACKAGE_FOLDER_NAME }} EXTRA_PACKAGES: ${{ matrix.EXTRA_PACKAGES }} steps: diff --git a/.github/workflows/install_dependencies.sh b/.github/workflows/install_dependencies.sh index 411e0d578..699c9803e 100644 --- a/.github/workflows/install_dependencies.sh +++ b/.github/workflows/install_dependencies.sh @@ -45,10 +45,9 @@ fi sudo apt-get install -y --no-install-recommends python${PYTHON_BINDING_VERSION}-dev libpython${PYTHON_BINDING_VERSION}-dev curl -sS https://bootstrap.pypa.io/get-pip.py | sudo python${PYTHON_BINDING_VERSION} -# to handle some error on missing pip dependencies -sudo pip${PYTHON_BINDING_VERSION} install testresources -sudo pip${PYTHON_BINDING_VERSION} install --upgrade setuptools==59.6.0 -sudo pip${PYTHON_BINDING_VERSION} install colcon-common-extensions unittest-xml-reporting pygccxml pyplusplus +if [[ "${BUILD_DOCU}x" != "x" ]]; then + sudo apt-get install doxygen graphviz lcov +fi if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then echo "!!!!!!! Ubunut 20.04 and python 3.10: compile boost 1.80 !!!!!!!" @@ -85,13 +84,5 @@ if (( IS_UBUNTU_20_04 && IS_PYTHON_3_10 )); then fi - -if [[ "${BUILD_DOCU}x" != "x" ]]; then - sudo apt-get install doxygen graphviz lcov - sudo pip3 install --upgrade six>=1.11.0 - sudo pip3 install Markdown==3.2.1 - sudo pip3 install mkdocs - sudo pip3 install markdown-include - sudo pip3 install pymdown-extensions==8.0.1 - sudo pip3 install pygments mdx_truly_sane_lists -fi +sudo apt remove python3-pygments +sudo pip${PYTHON_BINDING_VERSION} install -r .github/workflows/requirements.txt diff --git a/.github/workflows/requirements.txt b/.github/workflows/requirements.txt new file mode 100644 index 000000000..eefac7f36 --- /dev/null +++ b/.github/workflows/requirements.txt @@ -0,0 +1,14 @@ +colcon-common-extensions==0.3.0 +Markdown==3.7 +markdown-include==0.8.1 +mdx_truly_sane_lists==1.3 +mkdocs==1.6.1 +pygccxml==2.6.0 +Pygments==2.18.0 +pymdown-extensions==10.12 +pyplusplus==1.8.5 +setuptools==75.1.0 +six==1.16.0 +testresources==2.0.1 +unittest-xml-reporting==3.2.0 +