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

[tor/master] Remove HSv2 leftovers after merging #18346
by dgoulet＠torproject.org 23 Apr '21

23 Apr '21

commit 1d18ecbc5f74e8aba8096e9bfd851ff775bbce0d Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Apr 23 12:54:10 2021 -0400 Remove HSv2 leftovers after merging #18346 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/nodelist/dirlist.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/feature/nodelist/dirlist.c b/src/feature/nodelist/dirlist.c index 57b55f0127..1f1ac4d106 100644 --- a/src/feature/nodelist/dirlist.c +++ b/src/feature/nodelist/dirlist.c @@ -320,10 +320,7 @@ auth_dirport_usage_for_purpose(int purpose) case DIR_PURPOSE_FETCH_STATUS_VOTE: return AUTH_USAGE_VOTING; - case DIR_PURPOSE_HAS_FETCHED_RENDDESC_V2: case DIR_PURPOSE_SERVER: - case DIR_PURPOSE_UPLOAD_RENDDESC_V2: - case DIR_PURPOSE_FETCH_RENDDESC_V2: case DIR_PURPOSE_UPLOAD_HSDESC: case DIR_PURPOSE_FETCH_HSDESC: case DIR_PURPOSE_HAS_FETCHED_HSDESC:

1 0

[manual/translations] make cache more specific to avoid problems with other lektors
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit f3c11454a208fd2e74e7c8c9f9e97813cf135f7a Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 16:20:56 2021 +0000 make cache more specific to avoid problems with other lektors --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b10162..686c6c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: python:3.9-slim-buster cache: - key: ${CI_COMMIT_REF_SLUG} + key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG} paths: - .cache/pip - packages

1 0

[manual/translations] add more directories to cache, remove unnecessary trailing slash
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 7bcc5a45d18617f86f7932ceb12590927b8fa110 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 16:14:51 2021 +0000 add more directories to cache, remove unnecessary trailing slash --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4684d74..2b10162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,8 @@ cache: key: ${CI_COMMIT_REF_SLUG} paths: - .cache/pip - - venv/ + - packages + - venv - i18n - lego

1 0

[manual/translations] get rid of stages, we dont need them. remove i18n dir to prevent errors, while also allowing ci to run without cache: i need to find out why it is not a submodule
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 58edf20d4d26b43c37ecaa9b2be540bb5b147a90 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 16:01:25 2021 +0000 get rid of stages, we dont need them. remove i18n dir to prevent errors, while also allowing ci to run without cache: i need to find out why it is not a submodule --- .gitlab-ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3653d64..4684d74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,14 +11,7 @@ cache: variables: GIT_SUBMODULE_STRATEGY: recursive -stages: - - build - - test - - deploy - -pages: - stage: build - before_script: +before_script: - apt-get update - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector -y - pip3 install virtualenv @@ -27,8 +20,11 @@ pages: - pip3 install wheel - pip3 install lektor - echo 'checking out translations' + - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n - cd i18n && git checkout tbmanual-contentspot && cd .. + +pages: script: - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public @@ -40,7 +36,6 @@ pages: - translations check_l10n: - stage: test script: - git clone https://gitlab.torproject.org/tpo/community/l10n.git - pip3 install polib

1 0

[manual/translations] move l10n checks to their own stage, only run if there are changes. remove lego checkout because now we do it through the GIT_SUBMODULE_STRATEGY variable. leave the public dir to save build time
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 78d42c59b96319c51c57183137db9c340aa0d25a Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 15:49:23 2021 +0000 move l10n checks to their own stage, only run if there are changes. remove lego checkout because now we do it through the GIT_SUBMODULE_STRATEGY variable. leave the public dir to save build time --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5623a36..3653d64 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,23 +27,24 @@ pages: - pip3 install wheel - pip3 install lektor - echo 'checking out translations' - - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n - cd i18n && git checkout tbmanual-contentspot && cd .. - - echo 'checking out lego' - - 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 script: - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public - - git clone https://gitlab.torproject.org/tpo/community/l10n.git - - l10n/bin/check_markdown_links.py i18n/ - artifacts: paths: - public - i18n only: - translations + +check_l10n: + stage: test + script: + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - pip3 install polib + - l10n/bin/check_markdown_links.py i18n/ + rules: + - changes: + - i18n/*

1 0

[manual/translations] get virtualenv with pip to get it on the path
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit d17ebc7bce672fb27c086a422c8dce2e72d7c896 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 15:02:49 2021 +0000 get virtualenv with pip to get it on the path --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 793628c..5623a36 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,8 @@ pages: stage: build before_script: - apt-get 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 i18nspector -y + - DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector -y + - pip3 install virtualenv - virtualenv venv - source venv/bin/activate - pip3 install wheel

1 0

[manual/translations] improve caching & use docker python image to save resources
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 909801037f181362a6bf2dd8f76511a3f4cc5289 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 14:48:12 2021 +0000 improve caching & use docker python image to save resources --- .gitlab-ci.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c75112e..793628c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,15 +1,28 @@ -image: debian:buster-slim +image: python:3.9-slim-buster + +cache: + key: ${CI_COMMIT_REF_SLUG} + paths: + - .cache/pip + - venv/ + - i18n + - lego + +variables: + GIT_SUBMODULE_STRATEGY: recursive stages: - build - test + - deploy pages: stage: build - script: + before_script: - apt-get 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 i18nspector -y - - pip3 install babel + - virtualenv venv + - source venv/bin/activate - pip3 install wheel - pip3 install lektor - echo 'checking out translations' @@ -21,6 +34,7 @@ pages: - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout master && git pull && cd .. - rm -rf public + script: - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public - git clone https://gitlab.torproject.org/tpo/community/l10n.git

1 0

[manual/translations] just use same stage, so we dont need to reinstall everything
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit f5018e1cf4301a208b3a94d151cb7a8761cddc45 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 12:40:45 2021 +0000 just use same stage, so we dont need to reinstall everything --- .gitlab-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60ca3c8..c75112e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,8 @@ pages: - rm -rf public - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public + - git clone https://gitlab.torproject.org/tpo/community/l10n.git + - l10n/bin/check_markdown_links.py i18n/ artifacts: paths: @@ -30,9 +32,3 @@ pages: - i18n only: - translations -check_l10n_links: - stage: test - script: - - pip3 install polib - - git clone https://gitlab.torproject.org/tpo/community/l10n.git - - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/translations] move scripts to proper stage
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 04ce1621d112264da34cf32ab31eb2b15fddf39e Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 12:00:38 2021 +0000 move scripts to proper stage --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b539781..60ca3c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,6 @@ pages: - pip3 install babel - pip3 install wheel - pip3 install lektor - - pip3 install polib - echo 'checking out translations' - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n @@ -21,7 +20,6 @@ pages: - rm -rf lego - git clone https://git.torproject.org/project/web/lego.git lego - cd lego && git checkout master && git pull && cd .. - - git clone https://gitlab.torproject.org/tpo/community/l10n.git - rm -rf public - echo 'building lektor 3 times to get translations in place' - lektor build --output-path public && lektor build --output-path public && lektor build --output-path public @@ -35,4 +33,6 @@ pages: check_l10n_links: stage: test script: + - pip3 install polib + - git clone https://gitlab.torproject.org/tpo/community/l10n.git - l10n/bin/check_markdown_links.py i18n/

1 0

[manual/translations] correct lib name
by emmapeel＠torproject.org 23 Apr '21

23 Apr '21

commit 94a7a4838bb59bdbd5e3e7269c28a7435390382c Author: emma peel <emma.peel(a)riseup.net> Date: Fri Apr 23 11:50:33 2021 +0000 correct lib name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f07ee..b539781 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ pages: - pip3 install babel - pip3 install wheel - pip3 install lektor - - pip3 install pofile + - pip3 install polib - echo 'checking out translations' - rm -rf i18n - git clone https://git.torproject.org/translation.git i18n

1 0