Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into new_docs
Browse files Browse the repository at this point in the history
  • Loading branch information
costashatz committed Feb 1, 2024
2 parents 4ede05e + 551fe47 commit 1ad5b0f
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 59 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,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
Expand Down
26 changes: 0 additions & 26 deletions ci/install_dart.sh

This file was deleted.

16 changes: 1 addition & 15 deletions ci/install_dart_latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
5 changes: 0 additions & 5 deletions ci/install_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 0 additions & 10 deletions ci/install_pybind11.sh

This file was deleted.

0 comments on commit 1ad5b0f

Please sign in to comment.