aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cli/stasis_indexer/stasis_indexer_main.c27
-rw-r--r--src/lib/core/envctl.c3
-rw-r--r--src/lib/core/multiprocessing.c1
-rw-r--r--src/lib/delivery/delivery.c48
-rw-r--r--src/lib/delivery/include/delivery.h2
5 files changed, 45 insertions, 36 deletions
diff --git a/src/cli/stasis_indexer/stasis_indexer_main.c b/src/cli/stasis_indexer/stasis_indexer_main.c
index e674a5a..840e897 100644
--- a/src/cli/stasis_indexer/stasis_indexer_main.c
+++ b/src/cli/stasis_indexer/stasis_indexer_main.c
@@ -13,62 +13,39 @@ int indexer_combine_rootdirs(const char *dest, char **rootdirs, const size_t roo
char destdir_with_output[PATH_MAX] = {0};
char *destdir = destdir_bare;
- printf("destdir_bare\n");
strcpy(destdir_bare, dest);
- puts("done");
- printf("destdir_with_output\n");
strcpy(destdir_with_output, dest);
strcat(destdir_with_output, "/output");
- puts("done");
- printf("access destdir_with_output\n");
if (!access(destdir_with_output, F_OK)) {
destdir = destdir_with_output;
}
- puts("sprintf 1");
snprintf(cmd, sizeof(cmd), "rsync -ah%s --delete --exclude 'tools/' --exclude 'tmp/' --exclude 'build/' ", globals.verbose ? "v" : "q");
for (size_t i = 0; i < rootdirs_total; i++) {
- printf("i = %zu (rootdirs_total = %zu)\n", i, rootdirs_total);
-
char srcdir_bare[PATH_MAX] = {0};
char srcdir_with_output[PATH_MAX] = {0};
char *srcdir = srcdir_bare;
- puts("srcdir_bare");
strcpy(srcdir_bare, rootdirs[i]);
- puts("done");
- puts("srcdir_with_output");
strcpy(srcdir_with_output, rootdirs[i]);
strcat(srcdir_with_output, "/output");
- puts("done");
- puts("access srcdir_bare");
if (access(srcdir_bare, F_OK)) {
fprintf(stderr, "%s does not exist\n", srcdir_bare);
continue;
}
- puts("access srcdir_with_output");
if (!access(srcdir_with_output, F_OK)) {
srcdir = srcdir_with_output;
}
- puts("snprintf 2");
- printf("cmd = %s\n", cmd);
- printf("cmd len = %zu\n", strlen(cmd));
- printf("cmd size = %zu\n", sizeof(cmd));
- printf("cmd maxlen = %zu\n", sizeof(cmd) - strlen(cmd) + 4);
- printf("srcdir = %s\n", srcdir);
- snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd) + 4, "'%s'/ ", srcdir);
- puts(cmd);
+ snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), "'%s'/ ", srcdir);
}
- puts("snprintf 3");
- snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd) + 2, " %s/", destdir);
+ snprintf(cmd + strlen(cmd), sizeof(cmd) - strlen(cmd), " %s/", destdir);
if (globals.verbose) {
puts(cmd);
}
- puts("running command");
if (system(cmd)) {
return -1;
}
diff --git a/src/lib/core/envctl.c b/src/lib/core/envctl.c
index 0be3f89..b036611 100644
--- a/src/lib/core/envctl.c
+++ b/src/lib/core/envctl.c
@@ -17,6 +17,8 @@ struct EnvCtl *envctl_init() {
}
static int callback_builtin_nop(const void *a, const void *b) {
+ (void) a; // Unused
+ (void) b; // Unused
return STASIS_ENVCTL_RET_SUCCESS;
}
@@ -58,6 +60,7 @@ size_t envctl_get_index(const struct EnvCtl *envctl, const char *name) {
}
void envctl_decode_index(size_t in_i, size_t *state, size_t *out_i, size_t *name_i) {
+ (void) name_i;
*state = ((in_i >> 63L) & 1);
*out_i = in_i & 0xffffffffL;
}
diff --git a/src/lib/core/multiprocessing.c b/src/lib/core/multiprocessing.c
index 0cf251e..d59a7cd 100644
--- a/src/lib/core/multiprocessing.c
+++ b/src/lib/core/multiprocessing.c
@@ -9,6 +9,7 @@ static struct MultiProcessingTask *mp_pool_next_available(struct MultiProcessing
}
int child(struct MultiProcessingPool *pool, struct MultiProcessingTask *task) {
+ (void) pool;
FILE *fp_log = NULL;
// The task starts inside the requested working directory
diff --git a/src/lib/delivery/delivery.c b/src/lib/delivery/delivery.c
index d79686c..600ddf9 100644
--- a/src/lib/delivery/delivery.c
+++ b/src/lib/delivery/delivery.c
@@ -6,7 +6,7 @@ static char *strdup_maybe(const char * restrict s) {
}
return NULL;
}
-struct Delivery *delivery_duplicate(struct Delivery *ctx) {
+struct Delivery *delivery_duplicate(const struct Delivery *ctx) {
struct Delivery *result = calloc(1, sizeof(*result));
if (!result) {
return NULL;
@@ -28,15 +28,6 @@ struct Delivery *delivery_duplicate(struct Delivery *ctx) {
result->conda.tool_build_version = strdup_maybe(ctx->conda.tool_build_version);
result->conda.tool_version = strdup_maybe(ctx->conda.tool_version);
- // Docker
- result->deploy.docker.build_args = strlist_copy(ctx->deploy.docker.build_args);
- result->deploy.docker.tags = strlist_copy(ctx->deploy.docker.tags);
- result->deploy.docker.capabilities = ctx->deploy.docker.capabilities;
- result->deploy.docker.dockerfile = strdup_maybe(ctx->deploy.docker.dockerfile);
- result->deploy.docker.image_compression = strdup_maybe(ctx->deploy.docker.image_compression);
- result->deploy.docker.registry = strdup_maybe(ctx->deploy.docker.registry);
- result->deploy.docker.test_script = strdup_maybe(ctx->deploy.docker.test_script);
-
// Info
result->info.build_name = strdup_maybe(ctx->info.build_name);
result->info.build_number = strdup_maybe(ctx->info.build_number);
@@ -108,6 +99,15 @@ struct Delivery *delivery_duplicate(struct Delivery *ctx) {
}
}
+ // Docker
+ result->deploy.docker.build_args = strlist_copy(ctx->deploy.docker.build_args);
+ result->deploy.docker.tags = strlist_copy(ctx->deploy.docker.tags);
+ result->deploy.docker.capabilities = ctx->deploy.docker.capabilities;
+ result->deploy.docker.dockerfile = strdup_maybe(ctx->deploy.docker.dockerfile);
+ result->deploy.docker.image_compression = strdup_maybe(ctx->deploy.docker.image_compression);
+ result->deploy.docker.registry = strdup_maybe(ctx->deploy.docker.registry);
+ result->deploy.docker.test_script = strdup_maybe(ctx->deploy.docker.test_script);
+
// Jfrog
// TODO: break out into a separate a function
for (size_t i = 0; i < sizeof(ctx->deploy.jfrog) / sizeof(ctx->deploy.jfrog[0]); i++) {
@@ -142,6 +142,34 @@ struct Delivery *delivery_duplicate(struct Delivery *ctx) {
result->deploy.jfrog[i].upload_ctx.workaround_parent_only = ctx->deploy.jfrog[i].upload_ctx.workaround_parent_only;
}
+ result->deploy.jfrog_auth.access_token = strdup_maybe(ctx->deploy.jfrog_auth.access_token);
+ result->deploy.jfrog_auth.client_cert_key_path = strdup_maybe(ctx->deploy.jfrog_auth.client_cert_key_path);
+ result->deploy.jfrog_auth.client_cert_path = strdup_maybe(ctx->deploy.jfrog_auth.client_cert_path);
+ result->deploy.jfrog_auth.insecure_tls = ctx->deploy.jfrog_auth.insecure_tls;
+ result->deploy.jfrog_auth.password = strdup_maybe(ctx->deploy.jfrog_auth.password);
+ result->deploy.jfrog_auth.server_id = strdup_maybe(ctx->deploy.jfrog_auth.server_id);
+ result->deploy.jfrog_auth.ssh_key_path = strdup_maybe(ctx->deploy.jfrog_auth.ssh_key_path);
+ result->deploy.jfrog_auth.ssh_passphrase = strdup_maybe(ctx->deploy.jfrog_auth.ssh_passphrase);
+ result->deploy.jfrog_auth.url = strdup_maybe(ctx->deploy.jfrog_auth.url);
+ result->deploy.jfrog_auth.user = strdup_maybe(ctx->deploy.jfrog_auth.user);
+
+ for (size_t i = 0; i < sizeof(result->tests) / sizeof(result->tests[0]); i++) {
+ result->tests[i].disable = ctx->tests[i].disable;
+ result->tests[i].parallel = ctx->tests[i].parallel;
+ result->tests[i].build_recipe = strdup_maybe(ctx->tests[i].build_recipe);
+ result->tests[i].name = strdup_maybe(ctx->tests[i].name);
+ result->tests[i].version = strdup_maybe(ctx->tests[i].version);
+ result->tests[i].repository = strdup_maybe(ctx->tests[i].repository);
+ result->tests[i].repository_info_ref = strdup_maybe(ctx->tests[i].repository_info_ref);
+ result->tests[i].repository_info_tag = strdup_maybe(ctx->tests[i].repository_info_tag);
+ result->tests[i].repository_remove_tags = strlist_copy(ctx->tests[i].repository_remove_tags);
+ if (ctx->tests[i].runtime.environ) {
+ result->tests[i].runtime.environ = runtime_copy(ctx->tests[i].runtime.environ->data);
+ }
+ result->tests[i].script = strdup_maybe(ctx->tests[i].script);
+ result->tests[i].script_setup = strdup_maybe(ctx->tests[i].script_setup);
+ }
+
return result;
}
diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h
index 9056cea..f8229ed 100644
--- a/src/lib/delivery/include/delivery.h
+++ b/src/lib/delivery/include/delivery.h
@@ -486,6 +486,6 @@ void delivery_rewrite_stage2(struct Delivery *ctx, char *specfile);
* @param ctx Delivery context
* @return a copy
*/
-struct Delivery *delivery_duplicate(struct Delivery *ctx);
+struct Delivery *delivery_duplicate(const struct Delivery *ctx);
#endif //STASIS_DELIVERY_H
generated by cgit (git 2.34.1) at 2025-11-07 14:25:26 -0500