From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Thu, 6 Aug 2020 07:25:46 +0000 (+0200)
Subject: Split the CI pipelines into proper steps
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~22^2~238^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6da67ef653dd473f02067deeced122261d522172;p=nextcloud-desktop.git

Split the CI pipelines into proper steps

Will make it easier to navigate the logs

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/.drone.yml b/.drone.yml
index dd56a7436..6bc04b412 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,19 +2,26 @@ kind: pipeline
 name: qt-5.12
 
 steps:
-- name: build and test
+- name: build
   image: nextcloudci/client-5.12:client-5.12-10
   volumes:
     - name: build
       path: /drone/build
   commands:
-    # Build client
     - /bin/bash -c "
       export CC=gcc-10 &&
       export CXX=g++-10 &&
       cd /drone/build &&
       cmake -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src &&
-      make -j$(nproc) &&
+      make -j$(nproc)"
+- name: test
+  image: nextcloudci/client-5.12:client-5.12-10
+  volumes:
+    - name: build
+      path: /drone/build
+  commands:
+    - /bin/bash -c "
+      cd /drone/build &&
       useradd -m -s /bin/bash test &&
       chown -R test:test . &&
       su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
@@ -35,23 +42,35 @@ kind: pipeline
 name: qt-5.12-clang
 
 steps:
-- name: build and test
+- name: build
   image: nextcloudci/client-5.12:client-5.12-10
   volumes:
     - name: build
       path: /drone/build
   commands:
-    # Build client
     - /bin/bash -c "
       export CC=clang-10 &&
       export CXX=clang++-10 &&
       cd /drone/build &&
       cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DNO_SHIBBOLETH=1 -DBUILD_UPDATER=ON -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../src &&
-      make -j$(nproc) &&
+      make -j$(nproc)"
+- name: test
+  image: nextcloudci/client-5.12:client-5.12-10
+  volumes:
+    - name: build
+      path: /drone/build
+  commands:
+    - /bin/bash -c "
+      cd /drone/build &&
       useradd -m -s /bin/bash test &&
       chown -R test:test . &&
       su -c 'ASAN_OPTIONS=detect_leaks=0 ctest --output-on-failure' test"
-    # Static analysis with clang-tidy
+- name: clang-tidy
+  image: nextcloudci/client-5.12:client-5.12-10
+  volumes:
+    - name: build
+      path: /drone/build
+  commands:
     - "! run-clang-tidy-10 -p /drone/build -header-filter $PWD -quiet | grep -A 5 ': error:'"
 
 volumes: