From 9921286f3bfede46627277defd5eda3b08c2c319 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 6 Apr 2018 00:29:20 -0600 Subject: [PATCH 1/2] travis: fix Transifex upload --- .travis.yml | 10 +--------- .travis/transifex/build.sh | 8 +++----- .travis/transifex/deps.sh | 3 +-- .travis/transifex/docker.sh | 26 ++++++++++++++++++++++++++ .travis/transifex/upload.sh | 5 ----- 5 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 .travis/transifex/docker.sh delete mode 100755 .travis/transifex/upload.sh diff --git a/.travis.yml b/.travis.yml index a3550024f..a25b7dad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,17 +30,9 @@ matrix: env: NAME="transifex push" sudo: required dist: trusty - addons: - apt: - packages: - - libsdl2-dev - - qtbase5-dev - - libqt5opengl5-dev - - qttools5-dev - - qttools5-dev-tools + services: docker install: "./.travis/transifex/deps.sh" script: "./.travis/transifex/build.sh" - after_success: "./.travis/transifex/upload.sh" - os: osx env: NAME="macos build" sudo: false diff --git a/.travis/transifex/build.sh b/.travis/transifex/build.sh index 2e9822360..904657525 100755 --- a/.travis/transifex/build.sh +++ b/.travis/transifex/build.sh @@ -1,6 +1,4 @@ -#!/bin/bash -ex - -mkdir build && cd build -cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -make translation +#!/bin/bash -e +echo "+docker run -e TRANSIFEX_API_TOKEN=[REDACTED] -v $(pwd):/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh" +docker run -e TRANSIFEX_API_TOKEN="${TRANSIFEX_API_TOKEN}" -v "$(pwd)":/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh diff --git a/.travis/transifex/deps.sh b/.travis/transifex/deps.sh index 3fa6b1109..16991bd3d 100755 --- a/.travis/transifex/deps.sh +++ b/.travis/transifex/deps.sh @@ -1,4 +1,3 @@ #!/bin/bash -ex -sudo pip install transifex-client -echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername = api\npassword = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc +docker pull alpine:latest diff --git a/.travis/transifex/docker.sh b/.travis/transifex/docker.sh new file mode 100644 index 000000000..24bf01084 --- /dev/null +++ b/.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 sdl2-dev 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 +make translation +cd .. + +cd dist/languages +tx push -s diff --git a/.travis/transifex/upload.sh b/.travis/transifex/upload.sh deleted file mode 100755 index f51847850..000000000 --- a/.travis/transifex/upload.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -ex - -cd dist/languages -tx push -s - From d190fd989d9c0be49343da3615c0182f801aa705 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 10 Apr 2018 17:49:42 -0600 Subject: [PATCH 2/2] travis: suggestions from @jroweboy --- .travis/transifex/build.sh | 1 - .travis/transifex/docker.sh | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis/transifex/build.sh b/.travis/transifex/build.sh index 904657525..7778e9a91 100755 --- a/.travis/transifex/build.sh +++ b/.travis/transifex/build.sh @@ -1,4 +1,3 @@ #!/bin/bash -e -echo "+docker run -e TRANSIFEX_API_TOKEN=[REDACTED] -v $(pwd):/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh" docker run -e TRANSIFEX_API_TOKEN="${TRANSIFEX_API_TOKEN}" -v "$(pwd)":/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh diff --git a/.travis/transifex/docker.sh b/.travis/transifex/docker.sh index 24bf01084..175d8e50e 100644 --- a/.travis/transifex/docker.sh +++ b/.travis/transifex/docker.sh @@ -7,7 +7,7 @@ set -x echo -e "\e[1m\e[33mInstalling dependencies...\e[0m" apk update -apk add build-base sdl2-dev cmake python3-dev qt5-qttools-dev +apk add build-base cmake python3-dev qt5-qttools-dev pip3 install transifex-client @@ -18,7 +18,7 @@ tx --version cd /citra mkdir build && cd build -cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release +cmake .. -DENABLE_QT_TRANSLATION=ON -DGENERATE_QT_TRANSLATION=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_SDL2=OFF make translation cd ..