diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2025-02-14 19:28:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-14 19:28:26 -0500 |
| commit | f96fc908099ce1e2c5ef10079de849da3ed34706 (patch) | |
| tree | 22e0ff2f03494f1ac613e53c3d443d258a60c412 | |
| parent | 9e15781b353819f106f0fced0322fff1b23f1e56 (diff) | |
| parent | 5bac4d7c79ee0148e8464abcbac6035440b4d196 (diff) | |
| download | stasis-f96fc908099ce1e2c5ef10079de849da3ed34706.tar.gz | |
Merge pull request #95 from jhunkeler/sanitize-docker-archive-name
Sanitize docker archive name
| -rw-r--r-- | .github/workflows/cmake-multi-platform.yml | 5 | ||||
| -rw-r--r-- | src/cli/stasis_indexer/helpers.c | 2 | ||||
| -rw-r--r-- | src/cli/stasis_indexer/readmes.c | 4 | ||||
| -rw-r--r-- | src/lib/delivery/delivery_install.c | 1 |
4 files changed, 7 insertions, 5 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 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); 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); |