diff options
| -rw-r--r-- | src/cli/stasis/args.c | 2 | ||||
| -rw-r--r-- | src/cli/stasis/stasis_main.c | 13 | ||||
| -rw-r--r-- | src/lib/core/globals.c | 1 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/cli/stasis/args.c b/src/cli/stasis/args.c index f3ce823..3617d0c 100644 --- a/src/cli/stasis/args.c +++ b/src/cli/stasis/args.c @@ -18,6 +18,7 @@ struct option long_options[] = { {"no-artifactory", no_argument, 0, OPT_NO_ARTIFACTORY}, {"no-artifactory-build-info", no_argument, 0, OPT_NO_ARTIFACTORY_BUILD_INFO}, {"no-artifactory-upload", no_argument, 0, OPT_NO_ARTIFACTORY_UPLOAD}, + {"no-export", no_argument, 0, OPT_NO_EXPORT}, {"no-testing", no_argument, 0, OPT_NO_TESTING}, {"no-parallel", no_argument, 0, OPT_NO_PARALLEL}, {"no-rewrite", no_argument, 0, OPT_NO_REWRITE_SPEC_STAGE_2}, @@ -41,6 +42,7 @@ const char *long_options_help[] = { "Do not upload artifacts to Artifactory", "Do not upload build info objects to Artifactory", "Do not upload artifacts to Artifactory (dry-run)", + "Do not export test or release environments (reuse existing tree)", "Do not execute test scripts", "Do not execute tests in parallel", "Do not rewrite paths and URLs in output files", diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c index 8a98efd..7d0a732 100644 --- a/src/cli/stasis/stasis_main.c +++ b/src/cli/stasis/stasis_main.c @@ -17,21 +17,14 @@ int main(int argc, char *argv[]) { char env_name_testing[STASIS_NAME_MAX] = {0}; char *delivery_input = NULL; char *config_input = NULL; - char installer_url[PATH_MAX]; - char python_override_version[STASIS_NAME_MAX]; + char installer_url[PATH_MAX] = {0}; + char python_override_version[STASIS_NAME_MAX] = {0}; int user_disabled_docker = false; globals.cpu_limit = get_cpu_count(); if (globals.cpu_limit > 1) { globals.cpu_limit--; // max - 1 } - memset(env_name, 0, sizeof(env_name)); - memset(env_name_testing, 0, sizeof(env_name_testing)); - memset(installer_url, 0, sizeof(installer_url)); - memset(python_override_version, 0, sizeof(python_override_version)); - memset(&proc, 0, sizeof(proc)); - memset(&ctx, 0, sizeof(ctx)); - int c; int option_index = 0; while ((c = getopt_long(argc, argv, "hVCc:p:vU", long_options, &option_index)) != -1) { @@ -121,7 +114,7 @@ int main(int argc, char *argv[]) { if (optind < argc) { while (optind < argc) { - // use first positional argument + // use first positional argument as delivery file delivery_input = argv[optind++]; break; } diff --git a/src/lib/core/globals.c b/src/lib/core/globals.c index 0f0941a..d453c62 100644 --- a/src/lib/core/globals.c +++ b/src/lib/core/globals.c @@ -38,6 +38,7 @@ struct STASIS_GLOBAL globals = { .enable_artifactory = true, ///< Toggle artifactory server usage .enable_artifactory_build_info = true, ///< Toggle build-info uploads .enable_artifactory_upload = true, ///< Toggle artifactory file uploads + .enable_export = true, //< Toggle conda environment creation and export .enable_testing = true, ///< Toggle [test] block "script" execution. "script_setup" always executes. .enable_rewrite_spec_stage_2 = true, ///< Leave template stings in output files .enable_parallel = true, ///< Toggle testing in parallel |