Index: ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile (revision 27099) +++ ps/trunk/build/jenkins/dockerfiles/clang7.Dockerfile (revision 27100) @@ -1,9 +1,9 @@ FROM build-base:latest RUN apt-get install -qqy clang-7 lld-7 USER builder ENV CC clang-7 ENV CXX clang++-7 -ENV LDFLAGS -fuse-ld=lld-7 \ No newline at end of file +ENV LDFLAGS -fuse-ld=lld-7 Index: ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile (revision 27099) +++ ps/trunk/build/jenkins/dockerfiles/gcc7.Dockerfile (revision 27100) @@ -1,10 +1,10 @@ FROM build-base:latest RUN apt-get install -qqy gcc-7 g++-7 USER builder ENV LIBCC gcc-7 ENV LIBCXX g++-7 ENV CC gcc-7 -ENV CXX g++-7 \ No newline at end of file +ENV CXX g++-7 Index: ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile =================================================================== --- ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile (revision 27099) +++ ps/trunk/build/jenkins/dockerfiles/translations.Dockerfile (revision 27100) @@ -1,9 +1,9 @@ FROM build-base # This silences a transifex-client warning -RUN apt-get install -qqy git +RUN apt-get install -qqy git subversion RUN pip3 install transifex-client lxml babel USER builder COPY --chown=builder transifexrc /home/builder/.transifexrc Index: ps/trunk/build/jenkins/pipelines/docker-translations.Jenkinsfile =================================================================== --- ps/trunk/build/jenkins/pipelines/docker-translations.Jenkinsfile (revision 27099) +++ ps/trunk/build/jenkins/pipelines/docker-translations.Jenkinsfile (revision 27100) @@ -1,72 +1,72 @@ /* Copyright (C) 2019 Wildfire Games. * This file is part of 0 A.D. * * 0 A.D. is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * 0 A.D. is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with 0 A.D. If not, see . */ // This pipeline is used to update translations to and from Transifex. pipeline { agent { node { label 'LinuxSlave' customWorkspace '/zpool0/trunk' } } stages { stage("Prepare volume") { steps { sh "sudo zfs clone zpool0/trunk@latest zpool0/translations" ws('/zpool0/translations') { sh "svn revert . -R" sh "svn st | cut -c 9- | xargs rm -rf" sh "svn up" } } } stage("Update translations") { steps { ws('/zpool0/translations') { withDockerContainer("0ad-translations:latest") { sh "python3 --version" dir("source/tools/i18n/") { - sh "maintenanceTasks.sh" + sh "./maintenanceTasks.sh" sh "python3 generateDebugTranslation.py --long" } } } } } stage("Commit") { steps { ws('/zpool0/translations') { withCredentials([usernamePassword(credentialsId: 'redacted', passwordVariable: 'SVNPASS', usernameVariable: 'SVNUSER')]) { sh "svn relocate --username ${SVNUSER} --password ${SVNPASS} --no-auth-cache https://svn.wildfiregames.com/svn/ps/trunk" sh "svn commit --username ${SVNUSER} --password ${SVNPASS} --no-auth-cache --non-interactive -m '[i18n] Updated POT and PO files.'" } } } } } post { always { sleep 10 sh "sudo zfs destroy zpool0/translations" } } }