Merge pull request #3647 from liushuyu/master

travis: fix Transifex upload

.travis.yml

@@ -30,17 +30,9 @@ matrix:
       env: NAME="transifex push"
       sudo: required
       dist: trusty
-      addons:
+      services: docker
-        apt:
-          packages:
-            - libsdl2-dev
-            - qtbase5-dev
-            - libqt5opengl5-dev
-            - qttools5-dev
-            - qttools5-dev-tools
       install: "./.travis/transifex/deps.sh"
       script: "./.travis/transifex/build.sh"
-      after_success: "./.travis/transifex/upload.sh"
     - os: osx
       env: NAME="macos build"
       sudo: false

.travis/transifex/build.sh

@@ -1,6 +1,3 @@
-#!/bin/bash -ex
+#!/bin/bash -e
-
-mkdir build && cd build
-cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release
-make translation
 
+docker run -e TRANSIFEX_API_TOKEN="${TRANSIFEX_API_TOKEN}" -v "$(pwd)":/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh

.travis/transifex/deps.sh

@@ -1,4 +1,3 @@
 #!/bin/bash -ex
 
-sudo pip install transifex-client
+docker pull alpine:latest
-echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = api\npassword = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc

.travis/transifex/docker.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+# Setup RC file for tx
+echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = api\npassword = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
+
+set -x
+
+echo -e "\e[1m\e[33mInstalling dependencies...\e[0m"
+apk update
+apk add build-base cmake python3-dev qt5-qttools-dev
+
+pip3 install transifex-client
+
+echo -e "\e[1m\e[33mBuild tools information:\e[0m"
+cmake --version
+gcc -v
+tx --version
+
+cd /citra
+mkdir build && cd build
+cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF
+make translation
+cd ..
+
+cd dist/languages
+tx push -s

.travis/transifex/upload.sh

@@ -1,5 +0,0 @@
-#!/bin/bash -ex
-
-cd dist/languages
-tx push -s
-