New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis: fix Transifex upload #3647

Merged
merged 2 commits into from Apr 11, 2018

Conversation

Projects
None yet
4 participants
@liushuyu
Contributor

liushuyu commented Apr 10, 2018

This PR will attempt to fix the Transifex upload failure in Travis CI build.
This should fix #3472 .

Please do note the Travis CI will still fail in this PR, since according to Travis CI documentation, the secured variables will not be exposed to PRs for safety concerns. So it will show something like:

tx INFO: Pushing resource citra.emulator
[?] Enter your api token: tx ERROR: EOF when reading a line

But I'd expect it to behave correctly after being merged.

Thanks


This change is Reviewable

@cluezbot

This comment has been minimized.

cluezbot commented Apr 10, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-04-10T21:48:06Z: 575099f...liushuyu:9921286f3bfede46627277defd5eda3b08c2c319

echo "+docker run -e TRANSIFEX_API_TOKEN=[REDACTED] -v $(pwd):/citra alpine /bin/sh -e /citra/.travis/transifex/docker.sh"

This comment has been minimized.

@jroweboy

jroweboy Apr 10, 2018

Member

Will we still want this echo here?

This comment has been minimized.

@liushuyu

liushuyu Apr 10, 2018

Contributor

I thought it may be better to display what was going on (since you enabled set -ex)

This comment has been minimized.

@liushuyu

liushuyu Apr 10, 2018

Contributor

This line of echo has been removed.

echo -e "\e[1m\e[33mInstalling dependencies...\e[0m"
apk update
apk add build-base sdl2-dev cmake python3-dev qt5-qttools-dev

This comment has been minimized.

@jroweboy

jroweboy Apr 10, 2018

Member

sdl2-dev shouldn't be needed if we build with -DENABLE_SDL2=No (i know we had it there previously, but i guess i didn't catch it when i reviewed this last time :/ )

This comment has been minimized.

@liushuyu

liushuyu Apr 10, 2018

Contributor

Okay, so adding -DENABLE_SDL2=NO to cmake line and remove sdl2-dev from the dependency list?

@cluezbot

This comment has been minimized.

cluezbot commented Apr 10, 2018

Hi, this is neobot, using neobrain's account. I'm keeping an archive of versions of this PR:

2018-04-10T23:50:38Z: 575099f...liushuyu:d190fd989d9c0be49343da3615c0182f801aa705

@liushuyu

This comment has been minimized.

Contributor

liushuyu commented Apr 10, 2018

.travis/transifex/docker.sh, line 10 at r1 (raw file):

sdl2-dev shouldn't be needed if we build with -DENABLE_SDL2=No (i know we had it there previously, but i guess i didn't catch it when i reviewed this last time :/ )

Changes applied


Comments from Reviewable

@MerryMage MerryMage merged commit 8b858f1 into citra-emu:master Apr 11, 2018

2 of 3 checks passed

code-review/reviewable 5 files, 2 discussions left (jroweboy)
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment