From c7fc6029e1682e367ec9a84eac03e8c3175ad5f4 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Feb 2025 18:51:59 -0500 Subject: Plug a few leaks --- src/cli/stasis_indexer/readmes.c | 4 ++-- src/lib/delivery/delivery_install.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cli/stasis_indexer/readmes.c b/src/cli/stasis_indexer/readmes.c index 7daf261..f24a0aa 100644 --- a/src/cli/stasis_indexer/readmes.c +++ b/src/cli/stasis_indexer/readmes.c @@ -63,10 +63,10 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) { && strlist_count(docker_images) && !strcmp(latest_deliveries[i].system.platform[DELIVERY_PLATFORM_RELEASE], "linux")) { fprintf(indexfp, "[Archive](../packages/docker/%s)\n", path_basename(strlist_item(docker_images, 0))); - guard_free(docker_images); } else { fprintf(indexfp, "N/A\n"); } + guard_free(docker_images); } } fprintf(indexfp, "\n"); @@ -95,10 +95,10 @@ int indexer_readmes(struct Delivery ctx[], const size_t nelem) { && strlist_count(docker_images) && !strcmp(current->system.platform[DELIVERY_PLATFORM_RELEASE], "linux")) { fprintf(indexfp, "[Archive](../packages/docker/%s)\n", path_basename(strlist_item(docker_images, 0))); - guard_free(docker_images); } else { fprintf(indexfp, "N/A\n"); } + guard_free(docker_images); guard_free(pattern); } fprintf(indexfp, "\n"); diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c index 15ad7e0..bb9bb48 100644 --- a/src/lib/delivery/delivery_install.c +++ b/src/lib/delivery/delivery_install.c @@ -12,6 +12,7 @@ static struct Test *requirement_from_test(struct Delivery *ctx, const char *name if (ctx->tests[i].name && !strcmp(package_name, ctx->tests[i].name)) { result = &ctx->tests[i]; + guard_free(package_name); break; } guard_free(package_name); -- cgit From 7ca33106fd391adf355f78137bb17437be594070 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Feb 2025 18:52:45 -0500 Subject: Use the same function as the delivery mechanism to ensure the docker archive name can be resolved --- src/cli/stasis_indexer/helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cli/stasis_indexer/helpers.c b/src/cli/stasis_indexer/helpers.c index 5ae01ca..e337787 100644 --- a/src/cli/stasis_indexer/helpers.c +++ b/src/cli/stasis_indexer/helpers.c @@ -269,7 +269,7 @@ struct StrList *get_docker_images(struct Delivery *ctx, char *pattern) { return NULL; } tolower_s(tarball); - replace_text(tarball, "+", "-", 0); + docker_sanitize_tag(tarball); struct StrList *files = NULL; get_files(&files, ctx->storage.docker_artifact_dir, tarball); -- cgit From 5bac4d7c79ee0148e8464abcbac6035440b4d196 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 14 Feb 2025 19:13:02 -0500 Subject: Renable tests D: --- .github/workflows/cmake-multi-platform.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index d9ddd20..ee601b1 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -57,8 +57,9 @@ jobs: cmake -B ${{ steps.strings.outputs.build-output-dir }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -DBUILD_TESTING=ON - -DBUILD_TESTING_RT=ON + -DTESTS=ON + -DTESTS_RT=ON + -DDEBUG_MESSAGES=ON -S ${{ github.workspace }} - name: Build -- cgit