From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 16 Aug 2022 16:52:07 +0200 Subject: [PATCH] GitHub workflows: native.yaml: add libedit-dev, except for jessie This is is required after switching from libreadline to libedit. On jessie, we can use libreadline5 (libreadline-gpl2-dev) without license issues. Trying to compile against libedit results in an "incompatible pointer type" error on jessie, because libedit uses a different prototype for rl_completion_entry_function. Signed-off-by: Martin Wilck Signed-off-by: Benjamin Marzinski --- .github/workflows/native.yaml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml index ddfd4a09..8b599209 100644 --- a/.github/workflows/native.yaml +++ b/.github/workflows/native.yaml @@ -22,13 +22,24 @@ jobs: - name: checkout uses: actions/checkout@v1 - name: build and test + if: ${{ matrix.os != 'jessie' }} run: make test + - name: build and test (jessie) + # On jessie, we use libreadline 5 (no licensing issue) + if: ${{ matrix.os == 'jessie' }} + run: make READLINE=libreadline test - name: clean run: make clean - name: clang + if: ${{ matrix.os != 'jessie' }} env: CC: clang run: make test + - name: clang (jessie) + if: ${{ matrix.os == 'jessie' }} + env: + CC: clang + run: make READLINE=libreadline test rolling: runs-on: ubuntu-20.04 @@ -56,12 +67,13 @@ jobs: libjson-c-dev liburcu-dev libcmocka-dev + libedit-dev - name: dependencies-alpine if: ${{ matrix.os == 'alpine' }} run: > apk add make gcc clang cmocka musl-dev lvm2-dev libaio-dev readline-dev ncurses-dev eudev-dev - userspace-rcu-dev json-c-dev cmocka-dev + userspace-rcu-dev json-c-dev cmocka-dev libedit-dev - name: dependencies-fedora if: ${{ matrix.os == 'fedora:rawhide' }} run: > @@ -76,6 +88,7 @@ jobs: userspace-rcu-devel json-c-devel libcmocka-devel + libedit-devel - name: checkout uses: actions/checkout@v1 - name: build and test