Skip to content

Commit 2d319be

Browse files
crazyhappygamePatriceJiang
authored andcommitted
Install ninja (#19298)
* Install ninja * Fix android_cocos_new_test
1 parent 9f424e2 commit 2d319be

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

tools/appveyor-scripts/before-build.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ If ($env:build_type -eq "windows32") {
4444
& $python -u .\tools\appveyor-scripts\setup_android.py --ndk_only
4545
Generate-Binding-Codes
4646
} elseif ($env:build_type -like "android*") {
47+
& choco install ninja
48+
& ninja --version
4749
& $python -u .\tools\appveyor-scripts\setup_android.py
4850
if ($lastexitcode -ne 0) {throw}
4951
}

tools/cocos2d-console

Submodule cocos2d-console updated 1 file

tools/travis-scripts/before-install.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ function install_environement_for_pull_request()
5959
echo "Building pull request ..."
6060

6161
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
62+
sudo apt-get update
63+
sudo apt-get install ninja-build
64+
ninja --version
6265
if [ "$BUILD_TARGET" == "linux" ]; then
6366
install_linux_environment
6467
fi
@@ -88,6 +91,9 @@ function install_environement_for_after_merge()
8891
}
8992

9093
if [ "$BUILD_TARGET" == "android_cocos_new_test" ]; then
94+
sudo apt-get update
95+
sudo apt-get install ninja-build
96+
ninja --version
9197
download_deps
9298
sudo python -m pip install retry
9399
python $COCOS2DX_ROOT/tools/appveyor-scripts/setup_android.py

0 commit comments

Comments
 (0)