From cf931fda6bfb3925555c7bd11d950a886676bcb3 Mon Sep 17 00:00:00 2001
From: Toni <matzeton@googlemail.com>
Date: Sun, 10 Oct 2021 13:13:52 +0200
Subject: Get rid of `configure.seed` as it comes with some disadvantages.
 (#1328)

* using Autotools best-practices to achieve (hopefully) the same result

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 .github/workflows/build.yml | 46 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to '.github')

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d98d40818..fb0ea834a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -139,6 +139,7 @@ jobs:
         if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64')
         run: |
           brew install autoconf automake libtool pkg-config gettext json-c
+          brew install coreutils
       - name: Install MacOS Prerequisites (libgcrypt)
         if: startsWith(matrix.os, 'macOS') && startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.gcrypt, '--disable-gcrypt')
         run: |
@@ -171,11 +172,13 @@ jobs:
         if: startsWith(matrix.arch, 'x86_64')
         run: |
           make all
-          cd example
-          make ndpiSimpleIntegration
-          cd ../python
-          make
-          cd ..
+          make -C example ndpiSimpleIntegration
+          make -C python
+      - name: Install nDPI
+        if: startsWith(matrix.arch, 'x86_64')
+        run: |
+          make install DESTDIR=$(realpath _install)
+          ls -alhHR _install
       - name: Test nDPI [DIFF]
         if: startsWith(matrix.arch, 'x86_64')
         run: |
@@ -215,13 +218,10 @@ jobs:
             apt-get -y install git autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev &&
             env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} &&
             make all &&
-            cd example &&
-            make ndpiSimpleIntegration &&
-            cd ../python &&
-            make &&
-            cd ../tests &&
-            ./do.sh &&
-            ./do-unit.sh
+            make -C example ndpiSimpleIntegration &&
+            make -C python &&
+            ./tests/do.sh &&
+            ./tests/do-unit.sh
             "
       - name: Display qemu specified architecture (armhf - little endian)
         if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'armhf')
@@ -242,13 +242,10 @@ jobs:
             apt-get -y install git autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev &&
             env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} &&
             make all &&
-            cd example &&
-            make ndpiSimpleIntegration &&
-            cd ../python &&
-            make &&
-            cd ../tests &&
-            ./do.sh &&
-            ./do-unit.sh
+            make -C example ndpiSimpleIntegration &&
+            make -C python &&
+            ./tests/do.sh &&
+            ./tests/do-unit.sh
             "
       - name: Display qemu specified architecture (s390x - big endian)
         if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 's390x')
@@ -269,11 +266,8 @@ jobs:
             apt-get -y install git autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev libgcrypt20-dev libpcre3-dev libmaxminddb-dev &&
             env CC=gcc CFLAGS='-Werror' ./autogen.sh --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} &&
             make all &&
-            cd example &&
-            make ndpiSimpleIntegration &&
-            cd ../python &&
-            make &&
-            cd ../tests &&
-            ./do.sh &&
-            ./do-unit.sh
+            make -C example ndpiSimpleIntegration &&
+            make -C python &&
+            ./tests/do.sh &&
+            ./tests/do-unit.sh
             "
-- 
cgit v1.2.3