From 1fbad393bfde2a340910fa5da43f8dce27a9ceab Mon Sep 17 00:00:00 2001 From: Adam Mills Date: Wed, 7 Mar 2018 09:46:33 -0500 Subject: [PATCH] Lokalise upload fix (#976) * Pin lokalise sceript to working version * Include cleanups from the home-assistant scripts --- .travis.yml | 2 +- script/translations_download | 3 +-- script/translations_upload_base | 5 ++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6e3456b544..1f8dd19040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: services: - docker before_deploy: - - docker pull lokalise/lokalise-cli + - docker pull lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7 deploy: provider: script script: script/travis_deploy diff --git a/script/translations_download b/script/translations_download index 9a1bbc4950..9a6eb84ea1 100755 --- a/script/translations_download +++ b/script/translations_download @@ -26,10 +26,9 @@ FILE_FORMAT=json mkdir -p ${LOCAL_DIR} -docker pull lokalise/lokalise-cli docker run \ -v ${LOCAL_DIR}:/opt/dest/locale \ - lokalise/lokalise-cli lokalise \ + lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7 lokalise \ --token ${LOKALISE_TOKEN} \ export ${PROJECT_ID} \ --export_empty skip \ diff --git a/script/translations_upload_base b/script/translations_upload_base index dcb401ac0f..5faf9cf0f7 100755 --- a/script/translations_upload_base +++ b/script/translations_upload_base @@ -26,15 +26,14 @@ LANG_ISO=en CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) -if [ "${CURRENT_BRANCH}" != "master" ] && [ "${TRAVIS_BRANCH}" != "master" ] ; then +if [ "${CURRENT_BRANCH-}" != "master" ] && [ "${TRAVIS_BRANCH-}" != "master" ] ; then echo "Please only run the translations upload script from a clean checkout of master." exit 1 fi -docker pull lokalise/lokalise-cli docker run \ -v ${LOCAL_FILE}:/opt/src/${LOCAL_FILE} \ - lokalise/lokalise-cli lokalise \ + lokalise/lokalise-cli@sha256:79b3108211ed1fcc9f7b09a011bfc53c240fc2f3b7fa7f0c8390f593271b4cd7 lokalise \ --token ${LOKALISE_TOKEN} \ import ${PROJECT_ID} \ --file /opt/src/${LOCAL_FILE} \