1 files changed, 32 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a61c06..1543f14 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,20 @@
+# TODO: Figure out if we can reuse these jobs but run them after our own checks without having
+#  to manually merge `stages`.
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+
 stages:
+  - ci-test
+  - pages
+  - provisioning
+  - build
+  - publish
   - test
-  - deploy
-  - Salsa-CI
 
 tests-testing:
-  stage: test
+  stage: ci-test
   image: debian:testing
   script:
     - apt-get update
@@ -12,7 +22,7 @@ tests-testing:
     - dpkg-buildpackage -us -uc -tc
 
 tests-unstable:
-  stage: test
+  stage: ci-test
   image: debian:unstable
   script:
     - apt-get update
@@ -20,7 +30,7 @@ tests-unstable:
     - dpkg-buildpackage -Ppkg.debputy.ci -us -uc -tc
 
 tests-unstable-without-optional-bd:
-  stage: test
+  stage: ci-test
   image: debian:unstable
   script:
     - apt-get update
@@ -28,7 +38,7 @@ tests-unstable-without-optional-bd:
     - dpkg-buildpackage -Ppkg.debputy.minimal-tests -us -uc -tc
 
 tests-unstable-coverage:
-  stage: test
+  stage: ci-test
   image: debian:unstable
   coverage: '/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/'
   script:
@@ -49,7 +59,7 @@ tests-unstable-coverage:
         path: coverage.xml
 
 pages:
-  stage: deploy
+  stage: pages
   script:
   - mkdir public
   - mv htmlcov public/
@@ -61,9 +71,18 @@ pages:
   only:
   - main
 
-# Once all tests have passed, also run the Debian build and packaging quality
-# assurance
-build_deb:
-   stage: Salsa-CI
-   trigger:
-     include: debian/salsa-ci.yml
+variables:
+  SALSA_CI_DISABLE_WRAP_AND_SORT: 0
+  SALSA_CI_WRAP_AND_SORT_ARGS: '-abkt'
+  SALSA_CI_AUTOPKGTEST_ALLOWED_EXIT_STATUS: 0
+  SALSA_CI_DISABLE_APTLY: 0
+
+debputy-lint:
+  stage: ci-test
+  image: debian:sid-slim
+  script:
+    - apt-get update -qq && apt-get -qq install --no-install-recommends --yes dh-debputy python3-pygls
+    - PERL5LIB=lib debputy lint --spellcheck
+  except:
+    variables:
+      - $CI_COMMIT_TAG != null && $SALSA_CI_ENABLE_PIPELINE_ON_TAGS !~ /^(1|yes|true)$/