Skip to content

Commit

Permalink
Fix Windows' CI script sourcing Dependencies from old Mercurial repo
Browse files Browse the repository at this point in the history
It should source it from github instead
Update to Visual Studio 2019
  • Loading branch information
darksylinc committed Mar 29, 2021
1 parent 8d44cac commit e72c5a1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 10 deletions.
11 changes: 8 additions & 3 deletions Scripts/BuildScripts/build_ci_windows.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
@echo off
SETLOCAL

set OGRE_BRANCH_NAME=master
set GENERATOR="Visual Studio 14 2015"
set GENERATOR="Visual Studio 16 2019"
set PLATFORM=x64
set CONFIGURATION=Debug
set BUILD_FOLDER=%APPVEYOR_BUILD_FOLDER%
Expand All @@ -25,10 +24,16 @@ IF EXIST %CMAKE_BIN_x64% (
)
echo Using CMake at %CMAKE_BIN%

%CMAKE_BIN% --version
echo -- PATH --
echo %PATH%
echo -- PYTHONPATH --
echo %PYTHONPATH%

IF NOT EXIST %BUILD_FOLDER%\..\ogredeps (
mkdir %BUILD_FOLDER%\..\ogredeps
echo --- Cloning Ogredeps ---
hg clone https://bitbucket.org/cabalistic/ogredeps %BUILD_FOLDER%\..\ogredeps
git clone --recurse-submodules --shallow-submodules https://github.com/OGRECave/ogre-next-deps %BUILD_FOLDER%\..\ogredeps
) ELSE (
echo --- Ogredeps repo detected. Cloning skipped ---
)
Expand Down
13 changes: 6 additions & 7 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
version: 2.2.{build}

branches:
only:
- master
- v2-1
version: 2.1.{build}

environment:
matrix:
Expand All @@ -23,7 +18,11 @@ environment:
# APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
# BUILD_SCRIPT: build_ogre_Visual_Studio_14_2015_x64.bat
- PLATFORM: x64
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
PYTHON: "C:\\Python36-x64"
PYTHONHOME: "C:\\Python36-x64"
PYTHONPATH: "C:\\Python36-x64\\lib\\site-packages"
PATH: "C:\\Python36-x64;C:\\Python36\\Scripts;%PATH%"
BUILD_SCRIPT: build_ci_windows.bat

cache:
Expand Down

0 comments on commit e72c5a1

Please sign in to comment.