From 8588c6783af958194c113b97c8b7b26a0eb593e3 Mon Sep 17 00:00:00 2001 From: Sourav Moitra Date: Wed, 30 Oct 2024 00:02:14 +0530 Subject: [PATCH] Manually installing jansson and env variables for CI process Signed-off-by: Sourav Moitra --- .github/workflows/test.yaml | 21 ++++++++++++++++----- Makefile.am | 2 ++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index af94a9f7..76296dd3 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -19,12 +19,12 @@ jobs: - arch: ppc64le distro: ubuntu_latest steps: - - uses: actions/checkout@v3.0.2 + - uses: actions/checkout@v4.2.2 with: submodules: true set-safe-directory: true - - uses: uraimo/run-on-arch-action@v2.2.0 + - uses: uraimo/run-on-arch-action@v2.8.1 name: Build id: build with: @@ -41,10 +41,21 @@ jobs: apt-get install -q -y python3 automake libtool autotools-dev git make cmake pkg-config gcc wget xz-utils run: | + # Install jansson + cd jansson; + autoreconf -fi; + ./configure; + make; + make install; + cd .. + + # Configure and Run libocispec + export JANSSON_CFLAGS=-I/usr/local/include; + export JANSSON_LIBS=/usr/local/lib/libjansson.so find $(pwd) -name '.git' -exec bash -c 'git config --global --add safe.directory ${0%/.git}' {} \; - ./autogen.sh --enable-embedded-yajl --enable-embedded-jansson - ./configure --enable-embedded-yajl --enable-embedded-jansson CFLAGS='-Wall -Wextra -Werror' - make -j $(nproc) distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-embedded-yajl --enable-embedded-jansson" AM_DISTCHECK_DVI_TARGET="" TESTS="" + ./autogen.sh --enable-embedded-yajl + ./configure --enable-embedded-yajl CFLAGS='-Wall -Wextra -Werror' + make -j $(nproc) distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-embedded-yajl" AM_DISTCHECK_DVI_TARGET="" TESTS="" # check that the working dir is clean git describe --broken --dirty --all | grep -qv dirty make clean diff --git a/Makefile.am b/Makefile.am index bfafca2c..52bea956 100644 --- a/Makefile.am +++ b/Makefile.am @@ -273,6 +273,8 @@ sync: (cd image-spec; git pull https://github.com/opencontainers/image-spec) (cd runtime-spec; git pull https://github.com/opencontainers/runtime-spec) (cd yajl; git pull https://github.com/containers/yajl main) + (cd jansson; git pull https://github.com/akheron/jansson master) + generate: src/runtime_spec_stamp src/image_spec_stamp src/image_manifest_stamp src/basic-test_stamp