diff options
| author | Toni Uhlig <matzeton@googlemail.com> | 2021-10-07 15:31:45 +0200 |
|---|---|---|
| committer | Toni Uhlig <matzeton@googlemail.com> | 2021-10-07 16:19:22 +0200 |
| commit | 977f372c80d3c22ca13a556fc283009a4260b3bd (patch) | |
| tree | e659e0d6706a8d15035608f5591cbd1a0a49a5c1 | |
| parent | 3ffb65a81c2e61650646d7382c8779f814993d0b (diff) | |
Fix `make dist` and add it to the CI along with `make -C doc text`. Fixes #1324fix-add/make-doc-and-CI
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
| -rw-r--r-- | .github/workflows/build.yml | 11 | ||||
| -rw-r--r-- | Makefile.am | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d98d40818..e818f57f6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,6 +115,7 @@ jobs: sudo apt-get update sudo apt-get install autoconf automake libtool pkg-config gettext libjson-c-dev flex bison libpcap-dev sudo apt-get install gcc-mingw-w64 libc6-dev + sudo apt-get install doxygen python3-sphinx python3-sphinx-rtd-theme python3-breathe python3-pip - name: Install Ubuntu Prerequisites (libgcrypt) if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') && !startsWith(matrix.gcrypt, '--disable-gcrypt') run: | @@ -188,6 +189,16 @@ jobs: if: startsWith(matrix.arch, 'x86_64') run: | ./tests/do-dga.sh + - name: Generate tarball + if: startsWith(matrix.os, 'ubuntu-latest') && startsWith(matrix.arch, 'x86_64') + run: | + make dist + - name: Generate documentation + if: startsWith(matrix.os, 'ubuntu-latest') && startsWith(matrix.arch, 'x86_64') + run: | + pip3 install --user sphinxcontrib.swaggerdoc + make -C doc text + make -C doc html - name: Configure nDPI [Mingw-w64] (runs only on ubuntu jobs) if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.arch, 'x86_64') run: | diff --git a/Makefile.am b/Makefile.am index 789a52ef3..d2710f391 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libndpi.pc -EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh configure.seed wireshark python windows utils packages doc/nDPI_QuickStartGuide.pages doc/nDPI_QuickStartGuide.pdf example/MacOS example/Win32 +EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md README.protocols autogen.sh configure.seed wireshark python windows utils packages example/MacOS doc/api.rst doc/conf.py doc/flow_risks.rst doc/guide/nDPI_QuickStartGuide.pages doc/guide/nDPI_QuickStartGuide.pdf doc/img/logo.png doc/index.rst doc/Makefile doc/what_is_ndpi.rst changelog: git log --since={`curl -s https://github.com/ntop/ndpi/releases | grep datetime | head -n1 | egrep -o "[0-9]+\-[0-9]+\-[0-9]+"`} --name-only --pretty=format:" - %s" | grep "^ " > CHANGELOG.latest |