commit 58edf20d4d26b43c37ecaa9b2be540bb5b147a90 Author: emma peel emma.peel@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