[tor-commits] [community/master] try to unify everything in one job, to prevent duplicating the work. part of https://gitlab.torproject.org/tpo/community/l10n/-/issues/40035

[emmapeel at torproject.org]

commit 93dd1aa982ded52eb0dd258043f9313b8174416d
Author: emma peel <emma.peel at riseup.net>
Date:   Thu Sep 2 10:14:35 2021 +0200

    try to unify everything in one job, to prevent duplicating the work. part of https://gitlab.torproject.org/tpo/community/l10n/-/issues/40035
---
 .gitlab-ci.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8cc9541..bd05699 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,32 +29,24 @@ cache:
 variables:
     GIT_SUBMODULE_STRATEGY: recursive
 
-before_script:
+pages:
+  script:
     - *apt-template
     - DEBIAN_FRONTEND=noninteractive apt-get install 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 lektor
     - echo 'checking out translations'
     - rm -rf i18n
     - git clone --branch communitytpo-contentspot https://git.torproject.org/translation.git i18n
-    - git clone https://gitlab.torproject.org/tpo/community/l10n.git
-    - pip3 install polib
-
-pages:
-  script:
     - echo 'reinstalling plugins to have last version'
     - lektor plugins reinstall
     - 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
     - echo 'lets see if there are any updates in the strings for translation'
+    - git clone https://gitlab.torproject.org/tpo/community/l10n.git
+    - pip3 install polib
     - l10n/bin/check_po_status.py communitytpo-contentspot
+    - l10n/bin/check_markdown_links.py i18n/
   artifacts:
     paths:
       - public
       - i18n
-
-check_l10n:
-  script:
-    - l10n/bin/check_markdown_links.py i18n/