From 8c9ad69dfe967344377d16de333a1b4f4be3c085 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 9 Oct 2017 14:22:04 +0100 Subject: [PATCH 1/2] Always npm install translations from master --- services/web/Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile index 5c7b4e160f..714adc5f3d 100644 --- a/services/web/Jenkinsfile +++ b/services/web/Jenkinsfile @@ -60,6 +60,9 @@ pipeline { sh 'mv app/views/external/googlebdb0f8f7f4a17241.html public/googlebdb0f8f7f4a17241.html' sh 'npm install' sh 'npm rebuild' + // It's too easy to end shrinkwrapping to a local, outdated version of translations. + // Ensure translations are always latest, regardless of shrinkwrap + sh 'npm install git+https://github.com/sharelatex/translations-sharelatex.git#master' sh 'npm install --quiet grunt' sh 'npm install --quiet grunt-cli' sh 'ls -l node_modules/.bin' From 24dd89bc3861e943f0add5bc1cbc3b6c962584b9 Mon Sep 17 00:00:00 2001 From: James Allen Date: Mon, 9 Oct 2017 14:23:05 +0100 Subject: [PATCH 2/2] Adjust wording --- services/web/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/web/Jenkinsfile b/services/web/Jenkinsfile index 714adc5f3d..50ced29d60 100644 --- a/services/web/Jenkinsfile +++ b/services/web/Jenkinsfile @@ -60,7 +60,7 @@ pipeline { sh 'mv app/views/external/googlebdb0f8f7f4a17241.html public/googlebdb0f8f7f4a17241.html' sh 'npm install' sh 'npm rebuild' - // It's too easy to end shrinkwrapping to a local, outdated version of translations. + // It's too easy to end up shrinkwrapping to an outdated version of translations. // Ensure translations are always latest, regardless of shrinkwrap sh 'npm install git+https://github.com/sharelatex/translations-sharelatex.git#master' sh 'npm install --quiet grunt'