summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-12 17:49:16 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-12 17:49:16 +0300
commit429a545dbd5d0fa992394cf7f4c83d5e972a14b2 (patch)
tree426c4acb069a395912ad6b4370936ff2839e3a6a
parent12759ce1aa4327e44632a356d81c2f0465571d8a (diff)
downloadmanaplus-429a545dbd5d0fa992394cf7f4c83d5e972a14b2.tar.gz
manaplus-429a545dbd5d0fa992394cf7f4c83d5e972a14b2.tar.bz2
manaplus-429a545dbd5d0fa992394cf7f4c83d5e972a14b2.tar.xz
manaplus-429a545dbd5d0fa992394cf7f4c83d5e972a14b2.zip
Fix tarball ci jobs.
-rwxr-xr-xtools/ci/jobs/gcc5_tarball.sh1
-rwxr-xr-xtools/ci/jobs/gcc6_tarball_tests.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/ci/jobs/gcc5_tarball.sh b/tools/ci/jobs/gcc5_tarball.sh
index 485ee99ef..bf7a9c656 100755
--- a/tools/ci/jobs/gcc5_tarball.sh
+++ b/tools/ci/jobs/gcc5_tarball.sh
@@ -50,6 +50,7 @@ export CXXFLAGS="$CXXFLAGS -ggdb3 -O2 -pipe -ffast-math \
do_init
run_configure --enable-werror
run_tarball test
+cp CMakeLists.txt.legacy CMakeLists.txt
run_configure --enable-werror
run_make
diff --git a/tools/ci/jobs/gcc6_tarball_tests.sh b/tools/ci/jobs/gcc6_tarball_tests.sh
index bb0bb78ac..81e0c9817 100755
--- a/tools/ci/jobs/gcc6_tarball_tests.sh
+++ b/tools/ci/jobs/gcc6_tarball_tests.sh
@@ -26,6 +26,7 @@ export CXXFLAGS="$CXXFLAGS $POST_CXXFLAGS"
do_init
run_configure --enable-unittests=yes $*
run_tarball test
+cp CMakeLists.txt.legacy CMakeLists.txt
run_configure --enable-unittests=yes $*
export SDL_VIDEODRIVER=dummy
run_make_check