From 5a889dbfdaa470392d39354c44e7685c055fd33d Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Sun, 19 Aug 2018 22:21:28 -0400 Subject: make it easier to find inkex.py --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index a3f6360b..d999f238 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,8 @@ install: if [ -n "$BUILD" ]; then # Need this for inkex.py and friends wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2 - tar jxf inkscape-0.92.3.tar.bz2 + mkdir inkscape + (cd inkscape; tar jxf --strip-components=1 inkscape-0.92.3.tar.bz2) rm inkscape-0.92.3.tar.bz2 fi if [ "$BUILD" = "linux" ]; then -- cgit v1.3.1 From d716429f3e4dc2ee45c3eec86502c035467c794c Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 21:21:21 -0400 Subject: add travis build task for crowdin integration --- .travis.yml | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index d999f238..3b602193 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,20 +14,26 @@ matrix: - python: 2.7 env: LINT=true sudo: false + if: type != cron - python: 2.7 sudo: required env: BUILD=linux - if: tag =~ ^v[0-9.]+$ OR branch != master + if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) - python: 2.7 sudo: required env: BUILD=windows - if: tag =~ ^v[0-9.]+$ OR branch != master + if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) - language: generic os: osx sudo: required env: BUILD=osx - if: tag =~ ^v[0-9.]+$ OR branch != master + if: type != cron AND (tag =~ ^v[0-9.]+$ OR branch != master) + + - language: java + sudo: false + env: CROWDIN=true + if: type = cron branches: except: - /^dev-build-/ @@ -146,6 +152,21 @@ script: # work around some bug... pyinstaller? shapely? not sure. cp $(winepath 'C:\Python\lib\site-packages\shapely\DLLs\geos_c.dll') $(winepath 'C:\Python\lib\site-packages\shapely\DLLs\geos.dll') make dist + elif [ -n "$CROWDIN" ]; then + git config --global user.email "inkstitch-crowdin@lex.gd" + git config --global user.name "Ink/Stitch Crowdin integration" + + wget https://crowdin.com/downloads/crowdin-cli.jar + java -jar crowdin-cli.jar pull -b master + + # Try to only commit if translations changed. Crowdin will update all + # files when a new translation string is added but we don't need to + # commit those until folks actually translate the new strings. + if git diff translations | grep -qE '^[-+]msgstr ".+"$'; then + git add translations + git commit -m "new translations from Crowdin" + git push https://${TRAVIS_REPO_SLUG%/*}:${GITHUB_API_KEY}@github.com/${TRAVIS_REPO_SLUG}.git master + fi else true fi -- cgit v1.3.1 From 119b423f4d876c917810e949d96d6eb7804301b5 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 21:26:21 -0400 Subject: fix tar invocation --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3b602193..abe14498 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ install: # Need this for inkex.py and friends wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2 mkdir inkscape - (cd inkscape; tar jxf --strip-components=1 inkscape-0.92.3.tar.bz2) + (cd inkscape; tar --strip-components=1 -jxf ../inkscape-0.92.3.tar.bz2) rm inkscape-0.92.3.tar.bz2 fi if [ "$BUILD" = "linux" ]; then -- cgit v1.3.1 From 9abb2f9799e9f4c075ac9686f2bfe5f5d567c681 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Mon, 20 Aug 2018 21:59:49 -0400 Subject: fix windows and mac --- .travis.yml | 4 ++-- Makefile | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index abe14498..ccacede3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,9 +44,9 @@ install: if [ -n "$BUILD" ]; then # Need this for inkex.py and friends wget -q https://inkscape.org/en/gallery/item/12187/inkscape-0.92.3.tar.bz2 - mkdir inkscape - (cd inkscape; tar --strip-components=1 -jxf ../inkscape-0.92.3.tar.bz2) + tar -jxf inkscape-0.92.3.tar.bz2 rm inkscape-0.92.3.tar.bz2 + mv inkscape-0.92.3 inkscape fi if [ "$BUILD" = "linux" ]; then # For some bizarre reason, this build has been failing due to the diff --git a/Makefile b/Makefile index 94194bf5..030ddd67 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,11 @@ distclean: .PHONY: inx inx: locales mkdir -p inx - bin/generate-inx-files + if [ "$$BUILD" = "windows" ]; then \ + wine c:\\Python\\python.exe bin/generate-inx-files; \ + else \ + bin/generate-inx-files; \ + fi .PHONY: messages.po messages.po: -- cgit v1.3.1