Skip to content

Commit 1f999bd

Browse files
crazyhappygamedrelaptop
authored andcommitted
Switch travis CI to xenial (cocos2d#19207)
* Switch travis CI to xenial * Remove language: android * Set language: cpp * Fix java problem * Update sdkmanager * Fix sdkmanger * next sdkmanager fix * Remove xenial from android * revert to sdk-tools-{system}-3859397 * Remove linux cmake install * Update before-install.sh * Update .travis.yml
1 parent 3ecbd1f commit 1f999bd

File tree

2 files changed

+3
-28
lines changed

2 files changed

+3
-28
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ matrix:
22
include:
33
# linux
44
- os: linux
5+
dist: xenial
56
env:
67
- BUILD_TARGET=linux
78
- GEN_BINDING_AND_COCOSFILE=true
@@ -61,9 +62,10 @@ matrix:
6162
sudo: required
6263
- os: linux
6364
env: BUILD_TARGET=android_cocos_new_test
64-
language: cpp
65+
language: android
6566
sudo: required
6667
- os: linux
68+
dist: xenial
6769
env: BUILD_TARGET=linux_cocos_new_test
6870
language: cpp
6971
sudo: required

tools/travis-scripts/before-install.sh

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,6 @@ function install_linux_environment()
2828
pushd $HOME/bin
2929

3030
echo "GCC version: `gcc --version`"
31-
# install new version cmake
32-
CMAKE_VERSION="3.7.2"
33-
CMAKE_DOWNLOAD_URL="https://cmake.org/files/v3.7/cmake-${CMAKE_VERSION}.tar.gz"
34-
echo "Download ${CMAKE_DOWNLOAD_URL}"
35-
${CURL} -O ${CMAKE_DOWNLOAD_URL}
36-
tar -zxf "cmake-${CMAKE_VERSION}.tar.gz"
37-
cd "cmake-${CMAKE_VERSION}"
38-
./configure > /dev/null
39-
make -j2 > /dev/null
40-
sudo make install > /dev/null
41-
echo "CMake Version: `cmake --version`"
42-
cd ..
43-
44-
# install new version binutils
45-
BINUTILS_VERSION="2.27"
46-
BINUTILS_URL="http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.gz"
47-
echo "Download ${BINUTILS_URL}"
48-
${CURL} -O ${BINUTILS_URL}
49-
tar -zxf "binutils-${BINUTILS_VERSION}.tar.gz"
50-
cd "binutils-${BINUTILS_VERSION}"
51-
./configure > /dev/null
52-
make -j2 > /dev/null
53-
sudo make install > /dev/null
54-
echo "ld Version: `ld --version`"
55-
echo "which ld: `which ld`"
56-
sudo rm /usr/bin/ld
57-
popd
5831
echo "Installing linux dependence packages ..."
5932
echo -e "y" | bash $COCOS2DX_ROOT/build/install-deps-linux.sh
6033
echo "Installing linux dependence packages finished!"

0 commit comments

Comments
 (0)