From 6430f86d4c0d1834a47dfbb7d1c0cc3b9953728c Mon Sep 17 00:00:00 2001
From: Ben Brown <ben@demerara.io>
Date: Sat, 5 Feb 2022 16:12:56 +0000
Subject: Update CI pipeline

Splits pipeline into two stages: linting and testing.
---
 .gitlab-ci.yml | 61 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a23b4e..fd377a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,39 +1,34 @@
-image: debian:stretch
+stages:
+  - lint
+  - test
 
-before_script:
-- apt-get update -y
-- apt-get install -y -qq python3-dev python3-pip
-
-# Static checker
-- apt-get install -y pyflakes3
-
-# Deps for running tests
-- apt-get install -y -qq cmdtest
+lint:
+  stage: lint
+  image: python:3
+  before_script:
+    - pip install pre-commit
+  script:
+    - pre-commit run -a
 
-# Deps to run lorry tests
-- apt-get install -y -qq git bzr cvs mercurial subversion hg-fast-export git-svn git-cvs bzr-fastimport
-- pip3 install pyyaml
-- pip3 install https://gitlab.com/trovekube/cliapp/-/archive/cliapp-1.20180812.1/cliapp-cliapp-1.20180812.1.tar.gz
+test:
+  stage: test
+  image: debian:stretch
+  needs: []
+  before_script:
+    - apt-get update -y
+    - apt-get install -y -qq python3-dev python3-pip
 
-# Configure git and bzr to run tests
-- git config --global user.email "jdoe@example.com"
-- git config --global user.name "Lorry Baserocker"
-- bzr whoami "Lorry Baserocker <jdoe@example.com>"
+    # Deps for running tests
+    - apt-get install -y -qq cmdtest
 
-run-pyflakes:
-  script:
-  - |
-    {
-        find . -path ./.git -prune -o -name '*.py' -print
-        find . -path ./.git -prune -o -type f -perm /111 -print |
-        while read script; do
-            # Check for Python shebang on the first line only
-            if awk '/^#!.*python/ { exit 0 } { exit 1 }' "$script"; then
-                echo "$script"
-            fi
-        done
-    } | xargs pyflakes3
+    # Deps to run lorry tests
+    - apt-get install -y -qq git bzr cvs mercurial subversion hg-fast-export git-svn git-cvs bzr-fastimport
+    - pip3 install pyyaml
+    - pip3 install https://gitlab.com/trovekube/cliapp/-/archive/cliapp-1.20180812.1/cliapp-cliapp-1.20180812.1.tar.gz
 
-run-check:
+    # Configure git and bzr to run tests
+    - git config --global user.email "jdoe@example.com"
+    - git config --global user.name "Lorry Baserocker"
+    - bzr whoami "Lorry Baserocker <jdoe@example.com>"
   script:
-  - sh check
+    - ./check
-- 
cgit v1.2.1