April 2021 - tor-commits - lists.torproject.org

[manual/translations] change name for stage
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 9ddfdac82315fc6e7c03d270d036db199d39466f Author: emma peel <emma.peel(a)riseup.net> Date: Tue Apr 20 11:38:09 2021 +0200 change name for stage --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd551ab..fc0ffb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,10 @@ image: debian:buster-slim stages: - - production + - build pages: - stage: production + stage: build script: - apt update - DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography -y

1 0

[manual/translations] Add .gitlab-ci.yml first try. ref: https://gitlab.torproject.org/tpo/web/support/-/snippets/89
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 1917acf4b5a0a85cf001be02b8eb97451f98806e Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 07:53:38 2021 +0000 Add .gitlab-ci.yml first try. ref: https://gitlab.torproject.org/tpo/web/support/-/snippets/89 --- .gitlab-ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..420222f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +image: debian:buster-slim + +stages: + - production + +pages: + stage: production + script: + - apt update + - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-venv python3-openssl python3-cryptography -y + - pip3 install babel + - pip3 install wheel + - pip3 install lektor + - rm -rf i18n + - git clone https://git.torproject.org/translation.git i18n + - cd i18n && git checkout support-portal && cd .. + - rm -rf lego + - git clone https://git.torproject.org/project/web/lego.git lego + - cd lego && git checkout origin/master && cd .. + - lektor build --output-path public + artifacts: + paths: + - public + only: + - translations

1 0

[manual/translations] try broken links test
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 9a140cdd6cf9dc70313007697269495531d3146e Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 13:33:20 2021 +0000 try broken links test --- .gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b960083..e20ed6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ image: debian:buster-slim stages: - build + - test pages: stage: build @@ -13,16 +14,20 @@ pages: - pip3 install lektor - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n - - cd i18n && git checkout tbmanual-contentspot - - grep -r '] (' *.po && cd .. + - cd i18n && git checkout tbmanual-contentspot && cd .. - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout master && git pull && cd .. - rm -rf public - lektor plugins reinstall - lektor build --output-path public && lektor build --output-path public + artifacts: paths: - public only: - translations +check_l10n: + stage: test + script: + - grep -r '] (' i18n/*.po >&2

1 0

[manual/translations] add plugin reinstall command, build a couple of times to fix translations
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 2d919a27162ba9927fd9c739e806a778ab31d114 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Apr 20 11:42:12 2021 +0200 add plugin reinstall command, build a couple of times to fix translations --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33fcf43..e10f72f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,8 @@ pages: - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout origin/master && cd .. - rm -rf public - - lektor build --output-path public + - lektor plugins reinstall + - lektor build --output-path public && lektor build --output-path public artifacts: paths: - public

1 0

[manual/translations] add test for broken markdown links, name branch better.
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit cf1684bc8645f1ad4b4381fc0d7d5edba4da5485 Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 12:47:04 2021 +0000 add test for broken markdown links, name branch better. --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e10f72f..b960083 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,10 +13,11 @@ pages: - pip3 install lektor - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n - - cd i18n && git checkout tbmanual-contentspot && cd .. + - cd i18n && git checkout tbmanual-contentspot + - grep -r '] (' *.po && cd .. - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - - cd lego && git checkout origin/master && cd .. + - cd lego && git checkout master && git pull && cd .. - rm -rf public - lektor plugins reinstall - lektor build --output-path public && lektor build --output-path public

1 0

[manual/translations] Update .gitlab-ci.yml
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 4772726923249f77d614944940c7c6d051f28ee4 Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 14:20:16 2021 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 571c8ef..4e971c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,4 +31,5 @@ pages: check_l10n: stage: test script: - - grep -r '] (' i18n/*.po >&2 + - if [[ $(grep -r '] (' i18n/*.po) ]] ; then echo "TEST FAILED: broken links" && `grep -r '] (' i18n/*.po >&2` ; else echo "no broken links"; fi || true + - allow_failure: true

1 0

[manual/translations] cache translation files
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit d22b91997f685b2836fe35e35ca7fa03fd4ae3ea Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 13:44:45 2021 +0000 cache translation files --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e20ed6c..571c8ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ pages: artifacts: paths: - public + - i18n only: - translations check_l10n:

1 0

[manual/translations] try to get a failure for broken links
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit cc0feefa6c5c47049424a78ee1aa514b65ff4031 Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 14:57:36 2021 +0000 try to get a failure for broken links --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6065e5..f6bf3a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,4 @@ pages: check_l10n: stage: test script: - - grep -r '] (' i18n/*.po >&2 - - if [[ $(grep -r '] (' i18n/*.po) ]] ; then echo "TEST FAILED: broken links" ;fi - - allow_failure: true + - grep -r '] (' i18n/*.po >&2 && echo 'TEST FAILED: Broken links'

1 0

[manual/translations] Update .gitlab-ci.yml
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit e1e8c4aa9784323ded0f302b5d5ed35faa02f6e1 Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 15:08:30 2021 +0000 Update .gitlab-ci.yml --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59cca36..d699df5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,4 +33,5 @@ pages: check_l10n: stage: test script: - - 'grep -r '] (' i18n/*.po >&2 && echo 'TEST FAILED: Broken links'' + - 'test-links=$(grep -r "] ("" i18n/*.po >&2 && echo "TEST FAILED: Broken links")' + - test-links

1 0

[manual/translations] still broken links test
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit d444f498b3f270b0ab9319aa2392286ce023a3ae Author: emma peel <emmapeel(a)torproject.org> Date: Tue Apr 20 14:23:32 2021 +0000 still broken links test --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e971c8..ab438c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,5 +31,6 @@ pages: check_l10n: stage: test script: - - if [[ $(grep -r '] (' i18n/*.po) ]] ; then echo "TEST FAILED: broken links" && `grep -r '] (' i18n/*.po >&2` ; else echo "no broken links"; fi || true + - if [[ $(grep -r '] (' i18n/*.po) ]] ; then echo "TEST FAILED: broken links" + - grep -r '] (' i18n/*.po >&2 - allow_failure: true

1 0