Skip to content

Commit

Permalink
Did this fix it?
Browse files Browse the repository at this point in the history
  • Loading branch information
costashatz committed Jan 31, 2024
1 parent 507ccc3 commit e24fe0a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 23 deletions.
1 change: 0 additions & 1 deletion .github/workflows/ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ jobs:
if [ "$COMPILER" = "clang" ]; then
export CC=/usr/bin/clang && export CXX=/usr/bin/clang++
fi
ldd /home/runner/.dart_install/$python_dist_dir/dartpy.cpython-38-x86_64-linux-gnu.so
cd ${{github.workspace}}
if [ "$BUILD_PYTHON" = "ON" ]; then
./waf configure --python --prefix=/usr --dart=~/.dart_install ;
Expand Down
18 changes: 9 additions & 9 deletions ci/install_dart_latest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ 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
# 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
Expand Down
8 changes: 4 additions & 4 deletions ci/install_packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ 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 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
Expand Down
18 changes: 9 additions & 9 deletions ci/install_pybind11.sh
Original file line number Diff line number Diff line change
@@ -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
# 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

0 comments on commit e24fe0a

Please sign in to comment.