diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-07-24 17:02:27 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-07-24 17:02:27 (GMT) |
| commit | b5b04aab845ce65792af70886f634a86e83846ee (patch) | |
| tree | c3fca26f59e8c17baa940a52cbb6efe1637bce9c | |
| parent | fc7862967aba0e15f29a5fcf0af67f2b8e540a3d (diff) | |
| parent | a68260f84fcbdbe8643f171467e8fa2edec4b80a (diff) | |
| download | libnl-b5b04aab845ce65792af70886f634a86e83846ee.zip libnl-b5b04aab845ce65792af70886f634a86e83846ee.tar.gz libnl-b5b04aab845ce65792af70886f634a86e83846ee.tar.bz2 | |
build: merge branch 'th/fix-github-actions'
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rwxr-xr-x | doc/autogen.sh | 10 | ||||
| -rwxr-xr-x | tools/build_release.sh | 1 |
4 files changed, 16 insertions, 7 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef0afad..89a1553 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,13 +73,15 @@ jobs: - name: Install packages for Release run: | test "${{ matrix.cc }}" == gcc || exit 0 - sudo apt-get -y --no-install-recommends install \ + python3 -m pip install \ asciidoc \ + graphviz \ + pygments + sudo apt-get -y --no-install-recommends install \ doxygen \ graphviz \ mscgen \ - source-highlight \ - python3-pygments + source-highlight - name: Build Release run: | @@ -1,5 +1,7 @@ #!/bin/bash +set -e + die() { echo "$@" >&2 exit 1 @@ -10,6 +12,6 @@ BASEDIR="$(dirname "$0")" cd "$BASEDIR" || die "Could not change into base directory $BASEDIR" autoreconf -fi || die "Error during autoreconf" -rm -Rf autom4te.cache; +rm -rf autom4te.cache doc/autogen.sh || die "Error during doc/autogen.sh" diff --git a/doc/autogen.sh b/doc/autogen.sh index a569614..a147e93 100755 --- a/doc/autogen.sh +++ b/doc/autogen.sh @@ -1,4 +1,10 @@ #!/bin/bash -autoreconf -fi; -rm -Rf autom4te.cache; +set -e + +BASEDIR="$(dirname "$0")" + +cd "$BASEDIR" || die "Could not change into base directory $BASEDIR" + +autoreconf -fi +rm -rf autom4te.cache diff --git a/tools/build_release.sh b/tools/build_release.sh index 2c77d24..e12a195 100755 --- a/tools/build_release.sh +++ b/tools/build_release.sh @@ -32,7 +32,6 @@ Build() { ./autogen.sh ./configure pushd ./doc/ - ./autogen.sh ./configure --enable-doc popd make -j 5 |