From 57cc75c462d3e1379fa87f313bb4ee43b542b6e2 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Wed, 31 Jan 2024 21:17:53 +0200 Subject: [PATCH 1/5] Update ci scripts --- .github/workflows/ci_linux.yml | 4 ++-- ci/install_dart_latest.sh | 20 ++++++++++---------- ci/install_packages.sh | 6 +++--- ci/install_pybind11.sh | 20 ++++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 757dcf2c..9b465ff3 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -18,12 +18,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] + os: [ubuntu-22.04] build_type: [Release] build_python: [ON] compiler: [gcc, clang] magnum_gui: [ON, OFF] - dart_tag: ["v6.12.1"] + dart_tag: ["v6.13.1"] env: COMPILER: ${{ matrix.compiler }} BUILD_TYPE: ${{ matrix.build_type }} diff --git a/ci/install_dart_latest.sh b/ci/install_dart_latest.sh index cf566d43..3066d607 100755 --- a/ci/install_dart_latest.sh +++ b/ci/install_dart_latest.sh @@ -12,16 +12,16 @@ if [ "$COMPILER" = "clang" ]; then export CC=/usr/bin/clang && export CXX=/usr/bin/clang++ fi -# Build pybind11 if needed; for clang we need at least v2.5.0 -if [ "$COMPILER" = "clang" ]; then - git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1 - cd pybind11 - mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF - make -j4 - sudo make install - cd ../.. -fi +# # Build pybind11 if needed; for clang we need at least v2.5.0 +# if [ "$COMPILER" = "clang" ]; then +# git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1 +# cd pybind11 +# mkdir build && cd build +# cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF +# make -j4 +# sudo make install +# cd ../.. +# fi git clone https://github.com/dartsim/dart.git cd dart diff --git a/ci/install_packages.sh b/ci/install_packages.sh index 637a9d34..1b13b472 100755 --- a/ci/install_packages.sh +++ b/ci/install_packages.sh @@ -7,9 +7,9 @@ sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config sudo ln -s /usr/bin/python3 /usr/bin/python # if gcc, we can safely use the official package, for clang we need to build it -if [ "$COMPILER" = "gcc" ]; then - sudo apt-get install -y --no-install-recommends pybind11-dev -fi +# if [ "$COMPILER" = "gcc" ]; then +sudo apt-get install -y --no-install-recommends pybind11-dev +# fi if [ "$MAGNUM_GUI" = "ON" ]; then sudo apt-get install -y --no-install-recommends libopenal-dev libglfw3-dev libsdl2-dev libdevil-dev libpng-dev libfaad-dev libfreetype6-dev libglm-dev diff --git a/ci/install_pybind11.sh b/ci/install_pybind11.sh index 532d9e07..5c766d45 100755 --- a/ci/install_pybind11.sh +++ b/ci/install_pybind11.sh @@ -1,10 +1,10 @@ -# Build pybind11 if needed; for clang we need at least v2.5.0 -if [ "$COMPILER" = "clang" ]; then - git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1 - cd pybind11 - mkdir build && cd build - cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF - make -j4 - sudo make install - cd ../.. -fi +# # Build pybind11 if needed; for clang we need at least v2.5.0 +# if [ "$COMPILER" = "clang" ]; then +# git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1 +# cd pybind11 +# mkdir build && cd build +# cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF +# make -j4 +# sudo make install +# cd ../.. +# fi From 722eca28486464a24f13d519f42d6a22e030d501 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Wed, 31 Jan 2024 21:28:12 +0200 Subject: [PATCH 2/5] Add forgotten libfmt --- ci/install_packages.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/install_packages.sh b/ci/install_packages.sh index 1b13b472..63ed6654 100755 --- a/ci/install_packages.sh +++ b/ci/install_packages.sh @@ -2,13 +2,13 @@ sudo apt-get -qq update sudo apt-get -y install software-properties-common mlocate sudo apt-add-repository -y ppa:dartsim/ppa sudo apt-get -qq update -sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev +sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev libfmt-dev pybind11-dev sudo ln -s /usr/bin/python3 /usr/bin/python -# if gcc, we can safely use the official package, for clang we need to build it +# # if gcc, we can safely use the official package, for clang we need to build it # if [ "$COMPILER" = "gcc" ]; then -sudo apt-get install -y --no-install-recommends pybind11-dev +# sudo apt-get install -y --no-install-recommends pybind11-dev # fi if [ "$MAGNUM_GUI" = "ON" ]; then From 65c557d8df89da2daadb485fd1ee5baba0919bda Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Wed, 31 Jan 2024 23:17:35 +0200 Subject: [PATCH 3/5] Ignore tests for a while --- .github/workflows/ci_linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 9b465ff3..2f5a7d99 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -68,8 +68,8 @@ jobs: ./waf configure --prefix=/usr --dart=~/.dart_install ; fi ./waf - - name: Run tests - run: ./waf --tests + # - name: Run tests + # run: ./waf --tests - name: Build examples run: ./waf examples - name: Install From 89a673d54250dd03638e83744185f0ebd80dcc06 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 1 Feb 2024 11:05:22 +0200 Subject: [PATCH 4/5] Let's fix tests as well --- .github/workflows/ci_linux.yml | 8 ++++---- ci/install_packages.sh | 2 +- wscript | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index 2f5a7d99..f008e416 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -63,13 +63,13 @@ jobs: fi cd ${{github.workspace}} if [ "$BUILD_PYTHON" = "ON" ]; then - ./waf configure --python --prefix=/usr --dart=~/.dart_install ; + ./waf configure --tests --python --prefix=/usr --dart=~/.dart_install ; else - ./waf configure --prefix=/usr --dart=~/.dart_install ; + ./waf configure --tests --prefix=/usr --dart=~/.dart_install ; fi ./waf - # - name: Run tests - # run: ./waf --tests + - name: Run tests + run: ./waf --tests - name: Build examples run: ./waf examples - name: Install diff --git a/ci/install_packages.sh b/ci/install_packages.sh index 63ed6654..6c2d7c79 100755 --- a/ci/install_packages.sh +++ b/ci/install_packages.sh @@ -2,7 +2,7 @@ sudo apt-get -qq update sudo apt-get -y install software-properties-common mlocate sudo apt-add-repository -y ppa:dartsim/ppa sudo apt-get -qq update -sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev libfmt-dev pybind11-dev +sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config git libeigen3-dev libccd-dev libfcl-dev libboost-regex-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libbullet-dev libode-dev liboctomap-dev libtinyxml-dev libtinyxml2-dev liburdfdom-dev liburdfdom-headers-dev python3-pip python3-numpy libpython3-dev libxi-dev libxmu-dev freeglut3-dev libopenscenegraph-dev libassimp-dev libfmt-dev pybind11-dev sudo ln -s /usr/bin/python3 /usr/bin/python diff --git a/wscript b/wscript index 53c2dafc..7f302501 100644 --- a/wscript +++ b/wscript @@ -103,7 +103,7 @@ def configure_robot_dart(conf): conf.check(features='cxx cxxprogram', lib=['pthread'], uselib_store='PTHREAD') conf.check_eigen(required=True, min_version=(3,2,92)) conf.check_dart(required=True) - if conf.env['DART_REQUIRES_BOOST']: + if conf.env['DART_REQUIRES_BOOST'] or conf.options.tests: conf.check_boost(lib='regex system filesystem unit_test_framework', min_version='1.58') conf.check_corrade(components='Utility PluginManager', required=False) conf.env['magnum_dep_libs'] = 'MeshTools Primitives Shaders SceneGraph GlfwApplication Text MagnumFont' From dee759a26ac8cab16e9abc62f4eb215ab2c9f52d Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 1 Feb 2024 11:17:30 +0200 Subject: [PATCH 5/5] Hopefully this is done --- ci/install_dart_latest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install_dart_latest.sh b/ci/install_dart_latest.sh index 3066d607..52d1718c 100755 --- a/ci/install_dart_latest.sh +++ b/ci/install_dart_latest.sh @@ -45,7 +45,7 @@ sudo ldconfig cd $CI_HOME # Hack for dartpy installation -python_file=/usr/lib/python3/dist-packages/dartpy.cpython-38-x86_64-linux-gnu.so +python_file=/usr/lib/python3/dist-packages/dartpy.cpython-310-x86_64-linux-gnu.so if [ -f "$python_file" ]; then cp $python_file ~/.dart_install/$python_dist_dir fi