From 7c106b9426de410ef7e939cfb6db5eaf4e57eb23 Mon Sep 17 00:00:00 2001 From: bernatx Date: Fri, 27 Oct 2023 14:39:37 +0200 Subject: [PATCH] adding Town15 as AdditionalMap --- Jenkinsfile | 4 ++-- Util/BuildTools/Setup.sh | 2 -- Util/ContentVersions.txt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cbb5b3aa..04849a567 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -95,7 +95,7 @@ pipeline steps { sh 'make package ARGS="--python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64 --chrono"' - sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' + sh 'make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate --python-version=3.7,2 --target-wheel-platform=manylinux_2_27_x86_64"' sh 'make examples ARGS="localhost 3654"' } post @@ -298,7 +298,7 @@ pipeline """ bat """ call ../setEnv64.bat - make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13 --target-archive=AdditionalMaps --clean-intermediate" + make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town11,Town12,Town13,Town15 --target-archive=AdditionalMaps --clean-intermediate" """ } post { diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 5785b90c3..9975d5eee 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -275,8 +275,6 @@ unset GTEST_BASENAME # -- Get Recast&Detour and compile it with libc++ ------------------------------ # ============================================================================== -RECAST_HASH=ffdc02 -RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162 RECAST_BASENAME=recast-${CXX_TAG} RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include diff --git a/Util/ContentVersions.txt b/Util/ContentVersions.txt index b0e9a3bee..524bf57ca 100644 --- a/Util/ContentVersions.txt +++ b/Util/ContentVersions.txt @@ -37,4 +37,4 @@ 0.9.12: 20210730_564bcdc 0.9.13: 20211112_d5cfa12 0.9.14: 20221201_5ec9328 -Latest: 20230623_5ec6f39 +Latest: 20231027_4d8d172