From 2a25095f3bdb739dec2946de7a5155dc2b38ddb5 Mon Sep 17 00:00:00 2001
From: Laurent Peuch <cortex@worlddomination.be>
Date: Wed, 25 May 2022 22:30:21 +0200
Subject: [PATCH 1/3] ci: migrate to v2 of gitlab templates

---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2747263..52c72ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,8 +7,9 @@ include:
   # (it needs to be at the same level than "- project")
   # - ".gitlab-ci-extended.yml"
   - project: "open-source/gitlab-ci-templates"
-    ref: "branch/default"
+    ref: "branch/v2"
     file:
+      - "templates/base.yml"                        # obligatory base template
       - "templates/no-duplicated-ci-pipelines.yml"  # use workflow to avoid duplicated pipelines
       - "templates/lint/black.yml"  # will do the equivalent of 'tox -e black'
       - "templates/lint/flake8.yml"  # will do the equivalent of 'tox -e flake8'
-- 
GitLab


From a5dbd01a06f443f6a970a050ba3ec3f4014abb5b Mon Sep 17 00:00:00 2001
From: Laurent Peuch <cortex@worlddomination.be>
Date: Wed, 25 May 2022 22:31:21 +0200
Subject: [PATCH 2/3] ci: add check-dependencies-resolution

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52c72ef..b01f9b3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,6 +16,7 @@ include:
       - "templates/lint/mypy.yml"  # will do the equivalent of 'tox -e mypy'
       - "templates/lint/check-manifest.yml"  # will do the equivalent of 'tox -e check-manifest'
       - "templates/lint/yamllint.yml"  # will do the equivalent of 'tox -e yamllint'
+      - "templates/lint/check-dependencies-resolution.yml"
       - "templates/tests/py3.yml"  # will do the equivalent of 'tox -e py3'
       - "templates/create-release-on-heptapod.yml"  # this will create a release on heptapod
       - "templates/upload-to-pypi.yml"  # on a new mercurial tag (expected to be done with release-new), will push a release on pypi
-- 
GitLab


From 36e591cbeced7ae518d6ea59e225d3eeef34ec40 Mon Sep 17 00:00:00 2001
From: Laurent Peuch <cortex@worlddomination.be>
Date: Wed, 25 May 2022 22:34:38 +0200
Subject: [PATCH 3/3] ci: remove readthedocs job in favor of heptapod hook

---
 .gitlab-ci.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b01f9b3..3fbc7dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,12 +112,3 @@ trigger-logilab-mtconverter-pipeline:
     project: open-source/logilab-mtconverter
     branch: branch/default
     strategy: depend
-
-trigger-readthedocs:
-  only:
-    refs:
-      - branch/default
-  stage: after-tests
-  script:
-    # regarding the " everywhere when there is a '%': yaml is extremly weird when % are involved
-    - curl -X POST -d "token=${READTHEDOCS_TOKEN}" https://readthedocs.org/api/v2/webhook/logilab-common/89595/ -w "\nhttp code:"\ "%{http_code}\n" -f
-- 
GitLab