From b8a7e0992018b8acdbf8760b994f779f40408962 Mon Sep 17 00:00:00 2001 From: Hans Zandbelt Date: Wed, 11 Sep 2024 10:31:50 +0200 Subject: [PATCH] enable JQ support in Github build/arch actions Signed-off-by: Hans Zandbelt --- .github/workflows/archs.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/archs.yml b/.github/workflows/archs.yml index fb31a38..ce14d7d 100644 --- a/.github/workflows/archs.yml +++ b/.github/workflows/archs.yml @@ -40,7 +40,7 @@ jobs: install: | apt-get update -y apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config wget - apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev redis-server memcached libpcre2-dev libpcre2-8-0 + apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev redis-server memcached libpcre2-dev libpcre2-8-0 libjq-dev apt-get install -y build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev libxml2 libxml2-dev uuid-dev cd /tmp wget --no-check-certificate https://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz @@ -49,6 +49,6 @@ jobs: cd /tmp/nginx && ./configure --with-debug run: | ./autogen.sh - ./configure --with-nginx=/tmp/nginx + ./configure --with-nginx=/tmp/nginx --with-jq=/usr sed -i "s/-l/#-l/g" /etc/memcached.conf service memcached start && service redis-server start && make check || (cat test-suite.log && exit -1) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6fe7db6..d649e6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: run: | sudo apt-get update -y sudo apt-get install -y apache2-dev libcjose-dev libssl-dev check pkg-config - sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev libpcre2-dev libpcre2-8-0 + sudo apt-get install -y libjansson-dev libcurl4-openssl-dev libhiredis-dev libmemcached-dev libpcre2-dev libpcre2-8-0 libjq-dev sudo apt-get install build-essential libpcre3 libpcre3-dev zlib1g zlib1g-dev libxml2 libxml2-dev uuid-dev cd /tmp wget https://nginx.org/download/nginx-${{ matrix.nginx_version }}.tar.gz @@ -48,7 +48,7 @@ jobs: - name: Configure run: | ./autogen.sh - ./configure --with-nginx=/tmp/nginx + ./configure --with-nginx=/tmp/nginx --with-jq=/usr - name: Make run: make