Skip to content

Switch travis CI to xenial #19207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Nov 27, 2018
Merged

Switch travis CI to xenial #19207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
43326ae
Switch travis CI to xenial
crazyhappygame Nov 25, 2018
2c57e7e
Remove language: android
crazyhappygame Nov 25, 2018
bf4c3f0
Set language: cpp
crazyhappygame Nov 25, 2018
7798d53
Fix java problem
crazyhappygame Nov 25, 2018
71892ed
Update sdkmanager
crazyhappygame Nov 26, 2018
11be333
Fix sdkmanger
crazyhappygame Nov 26, 2018
988a64a
next sdkmanager fix
crazyhappygame Nov 26, 2018
742b2ac
Remove xenial from android
crazyhappygame Nov 26, 2018
21a03f7
revert to sdk-tools-{system}-3859397
crazyhappygame Nov 26, 2018
6c8ea28
Remove linux cmake install
crazyhappygame Nov 26, 2018
adeb0ff
Update before-install.sh
crazyhappygame Nov 26, 2018
b9f72c7
Update .travis.yml
crazyhappygame Nov 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ matrix:
include:
# linux
- os: linux
dist: xenial
env:
- BUILD_TARGET=linux
- GEN_BINDING_AND_COCOSFILE=true
Expand Down Expand Up @@ -61,9 +62,10 @@ matrix:
sudo: required
- os: linux
env: BUILD_TARGET=android_cocos_new_test
language: cpp
language: android
sudo: required
- os: linux
dist: xenial
env: BUILD_TARGET=linux_cocos_new_test
language: cpp
sudo: required
Expand Down
27 changes: 0 additions & 27 deletions tools/travis-scripts/before-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,6 @@ function install_linux_environment()
pushd $HOME/bin

echo "GCC version: `gcc --version`"
# install new version cmake
CMAKE_VERSION="3.7.2"
CMAKE_DOWNLOAD_URL="https://cmake.org/files/v3.7/cmake-${CMAKE_VERSION}.tar.gz"
echo "Download ${CMAKE_DOWNLOAD_URL}"
${CURL} -O ${CMAKE_DOWNLOAD_URL}
tar -zxf "cmake-${CMAKE_VERSION}.tar.gz"
cd "cmake-${CMAKE_VERSION}"
./configure > /dev/null
make -j2 > /dev/null
sudo make install > /dev/null
echo "CMake Version: `cmake --version`"
cd ..

# install new version binutils
BINUTILS_VERSION="2.27"
BINUTILS_URL="http://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VERSION}.tar.gz"
echo "Download ${BINUTILS_URL}"
${CURL} -O ${BINUTILS_URL}
tar -zxf "binutils-${BINUTILS_VERSION}.tar.gz"
cd "binutils-${BINUTILS_VERSION}"
./configure > /dev/null
make -j2 > /dev/null
sudo make install > /dev/null
echo "ld Version: `ld --version`"
echo "which ld: `which ld`"
sudo rm /usr/bin/ld
popd
echo "Installing linux dependence packages ..."
echo -e "y" | bash $COCOS2DX_ROOT/build/install-deps-linux.sh
echo "Installing linux dependence packages finished!"
Expand Down