From 8c80ab9b1562dfaa0bebcc8fa1414ec2637704de Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 7 May 2024 17:37:58 +0200 Subject: [PATCH 1/4] utils: initialize fd Signed-off-by: Giuseppe Scrivano --- src/libcrun/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcrun/utils.c b/src/libcrun/utils.c index 884f71e61..2b27b078c 100644 --- a/src/libcrun/utils.c +++ b/src/libcrun/utils.c @@ -1037,7 +1037,7 @@ read_all_fd_with_size_hint (int fd, const char *description, char **out, size_t int read_all_file_at (int dirfd, const char *path, char **out, size_t *len, libcrun_error_t *err) { - cleanup_close int fd; + cleanup_close int fd = -1; fd = TEMP_FAILURE_RETRY (openat (dirfd, path, O_RDONLY | O_CLOEXEC)); if (UNLIKELY (fd < 0)) From dd9428b2106bd192659f3d0a3d2c8a7087a5d8f2 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 7 May 2024 17:40:26 +0200 Subject: [PATCH 2/4] blake3: initialize chunks_array Signed-off-by: Giuseppe Scrivano --- src/libcrun/blake3/blake3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcrun/blake3/blake3.c b/src/libcrun/blake3/blake3.c index 692f4b021..74fb485ec 100644 --- a/src/libcrun/blake3/blake3.c +++ b/src/libcrun/blake3/blake3.c @@ -174,7 +174,7 @@ INLINE size_t compress_chunks_parallel(const uint8_t *input, size_t input_len, assert(input_len <= MAX_SIMD_DEGREE * BLAKE3_CHUNK_LEN); #endif - const uint8_t *chunks_array[MAX_SIMD_DEGREE]; + const uint8_t *chunks_array[MAX_SIMD_DEGREE] = {0, }; size_t input_position = 0; size_t chunks_array_len = 0; while (input_len - input_position >= BLAKE3_CHUNK_LEN) { From f00fa22789b722ebe3aa663e69bed6f359f05feb Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 7 May 2024 15:18:40 +0200 Subject: [PATCH 3/4] libocispec: sync from upstream Signed-off-by: Giuseppe Scrivano --- libocispec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libocispec b/libocispec index c715dcdba..7b27d0a0b 160000 --- a/libocispec +++ b/libocispec @@ -1 +1 @@ -Subproject commit c715dcdbab8fe592daa8a11cbabc75aa76534c80 +Subproject commit 7b27d0a0bb87fdd7ee46365994e450a58405004f From d795081b1e5ec6ed7da0493cdf7bf8009377e56b Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Tue, 7 May 2024 15:31:55 +0200 Subject: [PATCH 4/4] tests: build on CentOS 10 without yajl Signed-off-by: Giuseppe Scrivano --- .github/workflows/test.yaml | 5 +++++ tests/centos10-build/Dockerfile | 9 +++++++++ tests/centos10-build/run-tests.sh | 20 ++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 tests/centos10-build/Dockerfile create mode 100755 tests/centos10-build/run-tests.sh diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index f07a4012f..e19b94846 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -72,6 +72,7 @@ jobs: - test: alpine-build - test: centos8-build - test: centos9-build + - test: centos10-build - test: clang-format - test: clang-check - test: checkpoint-restore @@ -150,6 +151,10 @@ jobs: sudo docker build -t crun-centos9-build tests/centos9-build sudo docker run --cgroupns=host --privileged --rm -v /sys/fs/cgroup:/sys/fs/cgroup:rw,rslave -v ${PWD}:/crun crun-centos9-build ;; + centos10-build) + sudo docker build -t crun-centos10-build tests/centos10-build + sudo docker run --cgroupns=host --privileged --rm -v /sys/fs/cgroup:/sys/fs/cgroup:rw,rslave -v ${PWD}:/crun crun-centos10-build + ;; clang-format) sudo docker build -t crun-clang-format tests/clang-format sudo docker run --rm -w /crun -v ${PWD}:/crun crun-clang-format diff --git a/tests/centos10-build/Dockerfile b/tests/centos10-build/Dockerfile new file mode 100644 index 000000000..c607881b1 --- /dev/null +++ b/tests/centos10-build/Dockerfile @@ -0,0 +1,9 @@ +FROM quay.io/centos/centos:stream10-development + +RUN yum --enablerepo='appstream' --enablerepo='baseos' --enablerepo='crb' install -y make \ + automake autoconf gettext criu-devel libtool gcc libcap-devel systemd-devel \ + libseccomp-devel python3 libtool git protobuf-c protobuf-c-devel xz + +COPY run-tests.sh /usr/local/bin + +ENTRYPOINT /usr/local/bin/run-tests.sh diff --git a/tests/centos10-build/run-tests.sh b/tests/centos10-build/run-tests.sh new file mode 100755 index 000000000..7cdc3423c --- /dev/null +++ b/tests/centos10-build/run-tests.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e +cd /crun + +git config --global --add safe.directory /crun + +git clean -fdx +./autogen.sh +./configure --enable-embedded-yajl CFLAGS='-Wall -Wextra -Werror' +make -j "$(nproc)" + +make -j "$(nproc)" distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-embedded-yajl" + +git clean -fdx +./autogen.sh +./configure --enable-embedded-yajl CFLAGS='-Wall -Wextra -Werror' --disable-systemd +make -j "$(nproc)" + +make -j "$(nproc)" distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-embedded-yajl"