1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 03:40:24 +00:00

Merge branch 'update_bullet_324' into 'master'

make use of new backported bullet 3.24

See merge request OpenMW/openmw!2870
This commit is contained in:
psi29a 2023-03-28 13:02:34 +00:00
commit 0a6741935c
2 changed files with 2 additions and 2 deletions

View file

@ -371,7 +371,7 @@ Ubuntu_Clang_integration_tests:
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
cache: cache:
key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v1 key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v2
paths: paths:
- .cache/pip - .cache/pip
- apt-cache/ - apt-cache/

View file

@ -56,7 +56,7 @@ declare -rA GROUPED_DEPS=(
libboost-iostreams1.74.0 libboost-iostreams1.74.0
libboost-program-options1.74.0 libboost-program-options1.74.0
libboost-system1.74.0 libboost-system1.74.0
libbullet3.06 libbullet3.24
libcollada-dom2.5-dp0 libcollada-dom2.5-dp0
libicu70 libicu70
libjpeg8 libjpeg8