From 6fdf9ff50de3e4daad5b7a747d6094357cfe86b0 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 1 Feb 2024 21:31:33 +0200 Subject: [PATCH 1/2] Remove uneeded file --- ci/install_dart.sh | 26 -------------------------- ci/install_dart_latest.sh | 16 +--------------- ci/install_packages.sh | 5 ----- ci/install_pybind11.sh | 10 ---------- 4 files changed, 1 insertion(+), 56 deletions(-) delete mode 100755 ci/install_dart.sh delete mode 100755 ci/install_pybind11.sh diff --git a/ci/install_dart.sh b/ci/install_dart.sh deleted file mode 100755 index 43bee45d..00000000 --- a/ci/install_dart.sh +++ /dev/null @@ -1,26 +0,0 @@ -if [ "$TRAVIS_OS_NAME" == "linux" ]; then - sudo apt-get -qq update - sudo apt-get -y install software-properties-common - sudo apt-add-repository -y ppa:dartsim/ppa - sudo apt-get -qq update - - sudo apt-get install -y --no-install-recommends libassimp-dev libccd-dev libfcl-dev - - sudo apt-get install -y --no-install-recommends libdart6-dev libdart6-utils-urdf-dev #python3-dartpy - - # libdart6-dev installs a config with ode and bullet on - sudo apt-get install -y --no-install-recommends libdart6-collision-ode-dev libdart6-collision-bullet-dev -else - HOMEBREW_NO_AUTO_UPDATE=1 brew install dartsim - if [ "$PYTHON_TESTS" = "ON" ]; then - # HOMEBREW_NO_AUTO_UPDATE=1 brew install dartpy - git clone https://github.com/dartsim/dart.git - cd dart - git checkout v6.9.2 - mkdir build_py - cd build_py - cmake -DDART_BUILD_DARTPY=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. - make -j4 - sudo make install - fi -fi \ No newline at end of file diff --git a/ci/install_dart_latest.sh b/ci/install_dart_latest.sh index 52d1718c..ce2a104f 100755 --- a/ci/install_dart_latest.sh +++ b/ci/install_dart_latest.sh @@ -12,17 +12,6 @@ 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 - git clone https://github.com/dartsim/dart.git cd dart git checkout $DART_TAG @@ -37,10 +26,7 @@ cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREF fi make -j4 sudo make install -# We do not need this anymore -# if [ "$BUILD_PYTHON" = "ON" ] && [ "$DART_TAG" = "v6.11.1"]; then -# sudo make install-dartpy -# fi + sudo ldconfig cd $CI_HOME diff --git a/ci/install_packages.sh b/ci/install_packages.sh index 6c2d7c79..450d39ea 100755 --- a/ci/install_packages.sh +++ b/ci/install_packages.sh @@ -6,11 +6,6 @@ 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 [ "$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 fi diff --git a/ci/install_pybind11.sh b/ci/install_pybind11.sh deleted file mode 100755 index 5c766d45..00000000 --- a/ci/install_pybind11.sh +++ /dev/null @@ -1,10 +0,0 @@ -# # 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 551fe4748a20640b93a7be78bc36dcd527e6fd15 Mon Sep 17 00:00:00 2001 From: Konstantinos Chatzilygeroudis Date: Thu, 1 Feb 2024 21:39:56 +0200 Subject: [PATCH 2/2] Forgotten command --- .github/workflows/ci_linux.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/ci_linux.yml b/.github/workflows/ci_linux.yml index f008e416..bb0c90a5 100644 --- a/.github/workflows/ci_linux.yml +++ b/.github/workflows/ci_linux.yml @@ -46,9 +46,6 @@ jobs: - name: Build DART if: steps.cache-dart.outputs.cache-hit != 'true' run: ${{github.workspace}}/ci/install_dart_latest.sh - - name: Build pybind11 - if: steps.cache-dart.outputs.cache-hit == 'true' - run: ${{github.workspace}}/ci/install_pybind11.sh - name: Build Magnum run: if [ "$MAGNUM_GUI" = "ON" ]; then ${{github.workspace}}/ci/install_magnum.sh ; fi - name: Build robot_dart