ci: Build with libomemo-c for the "Linux Meson" job
The rest will stay with libsignal-protocol-c. So we test both. Let's add the dependency to all Dockerfiles already.
This commit is contained in:
4
.github/workflows/main.yml
vendored
4
.github/workflows/main.yml
vendored
@@ -37,9 +37,11 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Run tests
|
||||
env:
|
||||
OMEMO_BACKEND: libomemo-c
|
||||
run: |
|
||||
docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
|
||||
docker run profanity ./ci-meson-build.sh
|
||||
docker run -e OMEMO_BACKEND profanity ./ci-meson-build.sh
|
||||
|
||||
code-style:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
@@ -20,6 +20,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
|
||||
libmicrohttpd \
|
||||
libnotify \
|
||||
libsignal-protocol-c \
|
||||
libomemo-c \
|
||||
libotr \
|
||||
libtool \
|
||||
libxss \
|
||||
|
||||
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libotr5-dev \
|
||||
libreadline-dev \
|
||||
libsignal-protocol-c-dev \
|
||||
libomemo-c-dev \
|
||||
libssl-dev \
|
||||
libtool \
|
||||
libxss-dev \
|
||||
|
||||
@@ -25,6 +25,7 @@ RUN dnf install -y \
|
||||
libnotify-devel \
|
||||
libotr-devel \
|
||||
libsignal-protocol-c-devel \
|
||||
libomemo-c-devel \
|
||||
libtool \
|
||||
libuuid-devel \
|
||||
make \
|
||||
|
||||
@@ -25,6 +25,7 @@ RUN zypper --non-interactive in --no-recommends \
|
||||
libnotify-devel \
|
||||
libotr-devel \
|
||||
libsignal-protocol-c-devel \
|
||||
libomemo-c-devel \
|
||||
libtool \
|
||||
libuuid-devel \
|
||||
make \
|
||||
|
||||
@@ -21,6 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libotr5-dev \
|
||||
libreadline-dev \
|
||||
libsignal-protocol-c-dev \
|
||||
libomemo-c-dev \
|
||||
libssl-dev \
|
||||
libtool \
|
||||
libxss-dev \
|
||||
|
||||
@@ -35,15 +35,20 @@ tests=(
|
||||
"-Dgdk-pixbuf=disabled"
|
||||
)
|
||||
|
||||
BACKEND_OPT=""
|
||||
if [ -n "${OMEMO_BACKEND}" ]; then
|
||||
BACKEND_OPT="-Domemo-backend=${OMEMO_BACKEND}"
|
||||
fi
|
||||
|
||||
# Run Valgrind check (Only on Linux, on first/full feature set)
|
||||
if [[ "$(uname | tr '[:upper:]' '[:lower:]')" == linux* ]]; then
|
||||
echo "--> Running Valgrind check with full features"
|
||||
echo "--> Running Valgrind check with full features ${BACKEND_OPT}"
|
||||
|
||||
meson setup build_valgrind ${tests[0]} -Dtests=true -Db_sanitize=address,undefined
|
||||
meson setup build_valgrind ${tests[0]} ${BACKEND_OPT} -Dtests=true -Db_sanitize=address,undefined
|
||||
meson compile -C build_valgrind
|
||||
|
||||
|
||||
meson test -C build_valgrind --print-errorlogs --wrap=valgrind || echo "Valgrind issues detected"
|
||||
|
||||
|
||||
rm -rf build_valgrind
|
||||
fi
|
||||
|
||||
@@ -51,12 +56,12 @@ fi
|
||||
for features in "${tests[@]}"
|
||||
do
|
||||
echo "----------------------------------------------------"
|
||||
echo "--> Building with: ${features}"
|
||||
echo "--> Building with: ${features} ${BACKEND_OPT}"
|
||||
echo "----------------------------------------------------"
|
||||
|
||||
rm -rf build_run
|
||||
|
||||
meson setup build_run ${features} -Dtests=true
|
||||
meson setup build_run ${features} ${BACKEND_OPT} -Dtests=true
|
||||
meson compile -C build_run
|
||||
|
||||
meson test -C build_run --print-errorlogs
|
||||
|
||||
Reference in New Issue
Block a user