From 728030e3e7929e7876b25ce0884a6978d78fcd30 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Thu, 15 Apr 2021 10:05:23 +0200
Subject: [PATCH] ci: .drone.yml update vol. 2

* renamed some steps
* pipelines are modeled after a proper acyclic dependency graph now
* we attempt to build fastnetmon even if previous steps fail somewhere
  along the way
btw: these last two commits need splitting...
---
 .drone.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 47dbbf1f..c9ac9ff0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -52,16 +52,7 @@ steps:
   - printf "$PATH\n"
   - pacman -Sy grpc protobuf-c python-protobuf grpc-cli cppunit log4cpp json-c capnproto hiredis mongo-c-driver boost boost-libs libtool which autoconf automake pkgconf gcc-libs git --needed
 
-- name: apply-patch
-  pull: if-not-exists
-  image: immawanderer/archlinux-cdev:latest
-  volumes:
-  - name: usrcache
-    path: /usr
-  commands:
-  - git apply src/patches/cmake-libndpi-nolibicu-cpp17-includes-protoc-grpc.patch
-
-- name: build-install-nDPI
+- name: build-install nDPI
   pull: if-not-exists
   image: immawanderer/archlinux-cdev:latest
   volumes:
@@ -76,6 +67,17 @@ steps:
   - ./configure
   - make
   - make install
+  depends_on: [deps]
+
+- name: apply-patch
+  pull: if-not-exists
+  image: immawanderer/archlinux-cdev:latest
+  volumes:
+  - name: usrcache
+    path: /usr
+  commands:
+  - git apply src/patches/cmake-libndpi-nolibicu-cpp17-includes-protoc-grpc.patch
+  depends_on: [deps]
 
 - name: build fastnetmon
   pull: if-not-exists
@@ -88,6 +90,9 @@ steps:
   - cd src
   - cmake -DCMAKE_CXX_FLAGS="$CMAKE_CXX_FLAGS -Wall -Werror -Wextra -Wno-reorder -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-unused-but-set-variable -Wno-format-truncation -Wno-implicit-fallthrough -Wno-type-limits -Wno-class-memaccess -Wno-stringop-truncation"
   - make clean fastnetmon all
+  when:
+    status: [success, failure]
+  depends_on: [build-install nDPI, apply-patch]
 
 volumes:
 - name: usrcache
@@ -123,7 +128,7 @@ steps:
   - dnf install -y git make {c,auto}make autoconf lld binutils gcc gcc-c++ libgcc libstdc++-{devel,static} glibc-devel openmpi-devel bison flex grpc-{cli,cpp,devel,plugins} protobuf-c-{devel,compiler} protobuf-compiler cppunit log4cpp-devel json-c-devel capnproto-{devel,libs} libpcap-devel hiredis-devel mongo-c-driver-{devel,libs} boost-{devel,atomic,chrono,date-time,system,program-options,regex,thread} libtool libtool-ltdl which pkgconf openssl-devel kernel-devel ncurses-{c++-libs,devel,libs,static}
   - dnf clean all -y
 
-- name: build-install-nDPI
+- name: build-install nDPI
   pull: if-not-exists
   image: fedora:34
   volumes:
@@ -153,7 +158,7 @@ steps:
   commands:
   - cd /drone/src
   - git apply src/patches/cmake-libndpi-nolibicu-cpp17-includes-protoc-grpc.patch
-  depends_on: [build-install-nDPI]
+  depends_on: [deps]
 
 - name: build fastnetmon
   pull: if-not-exists
@@ -173,7 +178,7 @@ steps:
   - make clean fastnetmon all
   when:
     status: [success, failure]
-  depends_on: [apply-patch]
+  depends_on: [build-install nDPI, apply-patch]
 
 volumes:
 - name: usrcache