[tor-commits] [donate-static/master] Merge branch 'master' of gitlab.torproject.org:tpo/web/donate-static

[kez at torproject.org]

commit a9baca144d65c91c43f0d46dfe8241719e52d094
Merge: 5a96cbb9 e809cc4a
Author: kez <kez at torproject.org>
Date:   Sun Oct 24 17:19:10 2021 -0700

    Merge branch 'master' of gitlab.torproject.org:tpo/web/donate-static

 .gitlab-ci.yml                                     | 61 +++++++++++++++++++++-
 .../.well-known/pki-validation/E2ITYqblvSGtNaRbYj3 |  1 +
 content/well-known/contents.lr                     |  9 ----
 donate.lektorproject                               |  1 +
 templates/meta.html                                |  3 ++
 5 files changed, 64 insertions(+), 11 deletions(-)

diff --cc .gitlab-ci.yml
index dedadf48,16951072..7194027c
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1,4 -1,5 +1,9 @@@
++<<<<<<< HEAD
 +image: node:current-bullseye
++=======
+ image: debian:buster-slim
+ 
++>>>>>>> e809cc4a6ae50f8734fe7863b8c1a336664fe522
  
  # This template should be usable on any system that's based on apt.
  # taken from tor gitlabci
@@@ -23,11 -24,11 +28,10 @@@ variables
    GIT_SUBMODULE_STRATEGY: recursive
    PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
    TRANSLATION_BRANCH: "donate-static-contentspot"
-   LEKTOR_ENV: "dev"
- 
  
 -
  stages:
      - build
+     - test_l10n
  
  pages:
    cache:
@@@ -61,3 -62,57 +65,56 @@@
        - i18n
    rules:
      - when: always
+ 
+ check_new_strings:
+   cache:
+     key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+     paths:
+       - packages
+       - lego
+       - apt-cache
+       - venv
+       - .cache/pip
+ 
+   stage: test_l10n
+   needs: [pages]
+   allow_failure: true
+   rules:
+     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+     - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+     - if: '$CI_COMMIT_BRANCH == "translations"'
+       when: never
+     - changes:
+       - content/**/*.lr
+       - templates/**/*
+   script:
+     - *apt-template
+     - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev python3-setuptools i18nspector python3-polib python3-requests ca-certificates apt-utils -y
+     - git clone https://gitlab.torproject.org/tpo/community/l10n.git
+     - echo 'lets see if there are any updates in the strings for translation'
+     - l10n/bin/check_po_status.py $TRANSLATION_BRANCH
+   artifacts:
+     paths:
+       - public
+       - i18n
+       - l10n
+ 
+ check_l10n:
+   allow_failure: true
+   cache:
+     key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+     paths:
+       - packages
+       - lego
+       - apt-cache
+       - venv
+       - i18n
+       - .cache/pip
+   stage: test_l10n
+   needs: [pages]
+   only:
+     - translations
+   script:
+     - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector python3-polib ca-certificates -y
+     - echo 'lets see if there are any broken links on the translations'
+     - l10n/bin/check_markdown_links.py i18n/
 -