From 082e209552b33c1ceea5f86ecda6c360086fe0db Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Wed, 19 Feb 2020 20:30:53 -0600 Subject: [PATCH] Run valid character checks during the translations job. --- utils/dockerbuilds/travis/Dockerfile-base-1604-master | 2 +- utils/dockerbuilds/travis/Dockerfile-base-1804-master | 2 +- utils/travis/docker_run.sh | 3 +++ utils/travis/steps/script.sh | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/utils/dockerbuilds/travis/Dockerfile-base-1604-master b/utils/dockerbuilds/travis/Dockerfile-base-1604-master index 3d4231eb485..1c79a3e6ddb 100644 --- a/utils/dockerbuilds/travis/Dockerfile-base-1604-master +++ b/utils/dockerbuilds/travis/Dockerfile-base-1604-master @@ -14,7 +14,7 @@ RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-ima ENV DEBIAN_FRONTEND=noninteractive # misc -RUN apt install -y -qq libpng12-0 libpng12-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip +RUN apt install -y -qq libpng12-0 libpng12-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip moreutils RUN pip3 install --upgrade pip RUN yes | pip3 install paramiko diff --git a/utils/dockerbuilds/travis/Dockerfile-base-1804-master b/utils/dockerbuilds/travis/Dockerfile-base-1804-master index 316276dd14a..c7e5db2c165 100644 --- a/utils/dockerbuilds/travis/Dockerfile-base-1804-master +++ b/utils/dockerbuilds/travis/Dockerfile-base-1804-master @@ -14,7 +14,7 @@ RUN apt install -y -qq libsdl2-2.0-0 libsdl2-dev libsdl2-image-2.0-0 libsdl2-ima ENV DEBIAN_FRONTEND=noninteractive # misc -RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip +RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip moreutils RUN pip3 install --upgrade pip RUN yes | pip3 install paramiko diff --git a/utils/travis/docker_run.sh b/utils/travis/docker_run.sh index 0aa6891c0a2..6acb565271f 100755 --- a/utils/travis/docker_run.sh +++ b/utils/travis/docker_run.sh @@ -51,6 +51,9 @@ echo "build_timeout(mins): $build_timeout" $CXX --version if [ "$NLS" == "only" ]; then + ./utils/travis/check_utf8.sh || exit 1 + ./utils/travis/utf8_bom_dog.sh || exit 1 + 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 diff --git a/utils/travis/steps/script.sh b/utils/travis/steps/script.sh index 00f0dec8c04..f53eb1e1622 100755 --- a/utils/travis/steps/script.sh +++ b/utils/travis/steps/script.sh @@ -20,9 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "osx" ]; then exit $BUILD_RET else - ./utils/travis/check_utf8.sh || exit 1 - ./utils/travis/utf8_bom_dog.sh || exit 1 - "$CXX" --version if [ "$TOOL" = "scons" ]; then ln -s $HOME/build-cache/ build