Update CI build scripts to use new ogre-next-deps build

OGRECave · Feb 29, 2024 · 64ffd1c · 64ffd1c
1 parent 663d5fd
commit 64ffd1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/Scripts/BuildScripts/build_ci_linux.sh b/Scripts/BuildScripts/build_ci_linux.sh
@@ -9,10 +9,10 @@ sudo apt-get update
 sudo apt-get install -y ninja-build libxrandr-dev libxaw7-dev libxcb-randr0-dev libx11-xcb-dev libsdl2-dev
 
 echo "--- Fetching prebuilt Dependencies ---"
-wget https://github.com/OGRECave/ogre-next-deps/releases/download/bin-releases/Dependencies_Release_Ubuntu.20.04.LTS.Clang-12_a3f61e782f3effbd58a15727885cbd85cd1b342b.7z
+wget https://github.com/OGRECave/ogre-next-deps/releases/download/bin-releases/Dependencies_Release_Ubuntu.20.04.LTS.Clang-12_22ab475b517e724409cb6d585b3646ac6a7b23ea.7z
 
 echo "--- Extracting prebuilt Dependencies ---"
-7z x Dependencies_Release_Ubuntu.20.04.LTS.Clang-12_a3f61e782f3effbd58a15727885cbd85cd1b342b.7z
+7z x Dependencies_Release_Ubuntu.20.04.LTS.Clang-12_22ab475b517e724409cb6d585b3646ac6a7b23ea.7z
 
 mkdir -p build/Debug
 cd build/Debug

diff --git a/Scripts/BuildScripts/build_ci_windows.bat b/Scripts/BuildScripts/build_ci_windows.bat
@@ -30,25 +30,25 @@ echo %PATH%
 echo -- PYTHONPATH --
 echo %PYTHONPATH%
 
-IF NOT EXIST %BUILD_FOLDER%\..\ogredeps (
-	mkdir %BUILD_FOLDER%\..\ogredeps
-	echo --- Cloning Ogredeps ---
-	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps %BUILD_FOLDER%\..\ogredeps
+IF NOT EXIST %BUILD_FOLDER%\..\ogre-next-deps (
+	mkdir %BUILD_FOLDER%\..\ogre-next-deps
+	echo --- Cloning ogre-next-deps ---
+	git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps %BUILD_FOLDER%\..\ogre-next-deps
 ) ELSE (
-	echo --- Ogredeps repo detected. Cloning skipped ---
+	echo --- ogre-next-deps repo detected. Cloning skipped ---
 )
-mkdir %BUILD_FOLDER%\..\ogredeps\build
-cd %BUILD_FOLDER%\..\ogredeps\build
-echo --- Building Ogredeps ---
-%CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% %BUILD_FOLDER%\..\ogredeps
+mkdir %BUILD_FOLDER%\..\ogre-next-deps\build
+cd %BUILD_FOLDER%\..\ogre-next-deps\build
+echo --- Building ogre-next-deps ---
+%CMAKE_BIN% -G %GENERATOR% -A %PLATFORM% %BUILD_FOLDER%\..\ogre-next-deps
 %CMAKE_BIN% --build . --config %CONFIGURATION%
 %CMAKE_BIN% --build . --target install --config %CONFIGURATION%
 
 cd %BUILD_FOLDER%
 mkdir %BUILD_FOLDER%\build
 cd %BUILD_FOLDER%\build
 echo --- Running CMake configure ---
-%CMAKE_BIN% -D OGRE_UNITY_BUILD=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=%BUILD_FOLDER%\..\ogredeps\build\ogredeps -G %GENERATOR% -A %PLATFORM% %BUILD_FOLDER%
+%CMAKE_BIN% -D OGRE_UNITY_BUILD=1 -D OGRE_USE_BOOST=0 -D OGRE_CONFIG_THREAD_PROVIDER=0 -D OGRE_CONFIG_THREADS=0 -D OGRE_BUILD_COMPONENT_SCENE_FORMAT=1 -D OGRE_BUILD_SAMPLES2=1 -D OGRE_BUILD_TESTS=1 -D OGRE_DEPENDENCIES_DIR=%BUILD_FOLDER%\..\ogre-next-deps\build\ogre-next-deps -G %GENERATOR% -A %PLATFORM% %BUILD_FOLDER%
 echo --- Building Ogre ---
 %CMAKE_BIN% --build . --config %CONFIGURATION%
 %CMAKE_BIN% --build . --target install --config %CONFIGURATION%

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.3.{build}
+version: 3.0.{build}
 
 environment:
   matrix:
@@ -26,7 +26,7 @@ environment:
       BUILD_SCRIPT: build_ci_windows.bat
 
 cache:
-  - ..\ogredeps
+  - ..\ogre-next-deps
 
 build_script:
   - cmd: Scripts\BuildScripts\%BUILD_SCRIPT%