Running the translations is short, so do them through scons and cmake.

(cherry-picked from commit ea4d85a)
wesnoth · Oct 7, 2018 · 6da9f62 · 6da9f62
1 parent 5045c09
commit 6da9f62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ cache:
 matrix:
   include:
     - compiler: gcc
-      env: TOOL=scons CXXSTD=14 NLS=true LTS=1604 BRANCH=master
+      env: CXXSTD=14 NLS=true LTS=1604 BRANCH=master
 
     - compiler: gcc
       env: TOOL=scons CXXSTD=17 NLS=false LTS=1804 BRANCH=master

diff --git a/utils/travis/docker_run.sh b/utils/travis/docker_run.sh
@@ -52,11 +52,11 @@ echo "build_timeout(mins): $build_timeout"
 $CXX --version
 
 if [ "$NLS" == "true" ]; then
-    if [ "$TOOL" == "cmake" ]; then
-        cmake -DENABLE_NLS=true -DENABLE_GAME=false -DENABLE_SERVER=false -DENABLE_CAMPAIGN_SERVER=false -DENABLE_TESTS=false && make VERBOSE=1 -j2
-    else
-        scons translations build=release --debug=time nls=true jobs=2
-    fi
+    cmake -DENABLE_NLS=true -DENABLE_GAME=false -DENABLE_SERVER=false -DENABLE_CAMPAIGN_SERVER=false -DENABLE_TESTS=false
+    make VERBOSE=1 -j2 || exit 1
+    make clean
+
+    scons translations build=release --debug=time nls=true jobs=2
 else
     build_start=$(date +%s)