Skip to content

Commit 57cc75c

Browse files
committed
Update ci scripts
1 parent 6af12d8 commit 57cc75c

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

.github/workflows/ci_linux.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
os: [ubuntu-20.04]
21+
os: [ubuntu-22.04]
2222
build_type: [Release]
2323
build_python: [ON]
2424
compiler: [gcc, clang]
2525
magnum_gui: [ON, OFF]
26-
dart_tag: ["v6.12.1"]
26+
dart_tag: ["v6.13.1"]
2727
env:
2828
COMPILER: ${{ matrix.compiler }}
2929
BUILD_TYPE: ${{ matrix.build_type }}

ci/install_dart_latest.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ if [ "$COMPILER" = "clang" ]; then
1212
export CC=/usr/bin/clang && export CXX=/usr/bin/clang++
1313
fi
1414

15-
# Build pybind11 if needed; for clang we need at least v2.5.0
16-
if [ "$COMPILER" = "clang" ]; then
17-
git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1
18-
cd pybind11
19-
mkdir build && cd build
20-
cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF
21-
make -j4
22-
sudo make install
23-
cd ../..
24-
fi
15+
# # Build pybind11 if needed; for clang we need at least v2.5.0
16+
# if [ "$COMPILER" = "clang" ]; then
17+
# git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1
18+
# cd pybind11
19+
# mkdir build && cd build
20+
# cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF
21+
# make -j4
22+
# sudo make install
23+
# cd ../..
24+
# fi
2525

2626
git clone https://github.com/dartsim/dart.git
2727
cd dart

ci/install_packages.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ sudo apt-get install -y --no-install-recommends build-essential cmake pkg-config
77
sudo ln -s /usr/bin/python3 /usr/bin/python
88

99
# if gcc, we can safely use the official package, for clang we need to build it
10-
if [ "$COMPILER" = "gcc" ]; then
11-
sudo apt-get install -y --no-install-recommends pybind11-dev
12-
fi
10+
# if [ "$COMPILER" = "gcc" ]; then
11+
sudo apt-get install -y --no-install-recommends pybind11-dev
12+
# fi
1313

1414
if [ "$MAGNUM_GUI" = "ON" ]; then
1515
sudo apt-get install -y --no-install-recommends libopenal-dev libglfw3-dev libsdl2-dev libdevil-dev libpng-dev libfaad-dev libfreetype6-dev libglm-dev

ci/install_pybind11.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Build pybind11 if needed; for clang we need at least v2.5.0
2-
if [ "$COMPILER" = "clang" ]; then
3-
git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1
4-
cd pybind11
5-
mkdir build && cd build
6-
cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF
7-
make -j4
8-
sudo make install
9-
cd ../..
10-
fi
1+
# # Build pybind11 if needed; for clang we need at least v2.5.0
2+
# if [ "$COMPILER" = "clang" ]; then
3+
# git clone https://github.com/pybind/pybind11 -b 'v2.5.0' --single-branch --depth 1
4+
# cd pybind11
5+
# mkdir build && cd build
6+
# cmake .. -DCMAKE_BUILD_TYPE=Release -DPYBIND11_TEST=OFF
7+
# make -j4
8+
# sudo make install
9+
# cd ../..
10+
# fi

0 commit comments

Comments
 (0)