From b435465bc75d2a0a72a780f038c52819bf471b7c Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Fri, 9 Apr 2021 20:56:21 +0200
Subject: [PATCH] Merge style checks into tests

They're both run in pretty much the same environment, and it's
unnecessary to spin up a separate VM for that.
---
 .builds/style.yaml         | 16 ----------------
 .builds/tests-release.yaml |  4 ++++
 2 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 .builds/style.yaml

diff --git a/.builds/style.yaml b/.builds/style.yaml
deleted file mode 100644
index 12c5862..0000000
--- a/.builds/style.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-image: archlinux
-packages:
-  - docker
-  - docker-compose
-  - python-pip
-sources:
-  - https://github.com/pimutils/vdirsyncer
-tasks:
-  - setup: |
-      cd vdirsyncer
-      make -e install-style
-  - test: |
-      cd vdirsyncer
-      # Non-system python is used for packages:
-      export PATH=$PATH:~/.local/bin/
-      make -e style
diff --git a/.builds/tests-release.yaml b/.builds/tests-release.yaml
index 0a75f27..aad143f 100644
--- a/.builds/tests-release.yaml
+++ b/.builds/tests-release.yaml
@@ -16,6 +16,7 @@ tasks:
       cd vdirsyncer
       sudo systemctl start docker
       DAV_SERVER="radicale xandikos" make -e install-test
+      make -e install-style
   - test: |
       cd vdirsyncer
       # Non-system python is used for packages:
@@ -23,3 +24,6 @@ tasks:
       make -e ci-test
       DAV_SERVER=radicale make -e ci-test-storage
       DAV_SERVER=xandikos make -e ci-test-storage
+  - style: |
+      make -e install-style
+      make -e style