From cc9ef66ca505b5872d153afd105b3ef7b08c03c9 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 10 Dec 2023 01:00:28 -0500 Subject: Too many changes to count * Artifactory test integration * guard_free() all pointers * Remove semicolons from macro calls * Add conda_fresh_start to delete conda at start up (or not) * Use generated archives from github instead of the raw repository url. For now anyway. * Add delivery_runtime_show() to dump the runtime environment * Fix release output names to include the target architecture. This format will change agan soon. * Prevent bogus delivery definitions from going too far into the build process before encountering a failure. * Detect OS and architecture * Ensure the user's TMPDIR is usable before going too far into the process * Refactor omc output directory names --- include/deliverable.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/deliverable.h b/include/deliverable.h index b585054..135a14c 100644 --- a/include/deliverable.h +++ b/include/deliverable.h @@ -11,8 +11,8 @@ #include "ini.h" #include "environment.h" #include "conda.h" +#include "artifactory.h" -#define DELIVERY_DIR "delivery" #define DELIVERY_PLATFORM_MAX 4 #define DELIVERY_PLATFORM_MAXLEN 65 #define DELIVERY_PLATFORM 0 @@ -45,7 +45,10 @@ struct Delivery { * \brief Storage paths */ struct Storage { + char *root; ///< Top-level storage area + char *tmpdir; ///< Temporary storage area (within root) char *delivery_dir; ///< Delivery artifact output directory + char *tools_dir; ///< Tools storage char *conda_install_prefix; ///< Path to install Conda char *conda_artifact_dir; ///< Base path to store compiled conda packages char *conda_staging_dir; ///< Base path to copy compiled conda packages @@ -156,6 +159,12 @@ void delivery_conda_show(struct Delivery *ctx); */ void delivery_tests_show(struct Delivery *ctx); +/** + * Print Delivery initial runtime environment + * @param ctx pointner to Delivery context + */ +void delivery_runtime_show(struct Delivery *ctx); + /** * Build Conda recipes associated with the Delivery * @param ctx pointer to Delivery context @@ -278,4 +287,10 @@ void delivery_install_conda(char *install_script, char *conda_install_dir); // helper function void delivery_gather_tool_versions(struct Delivery *ctx); +// helper function +int delivery_init_tmpdir(struct Delivery *ctx); + +int delivery_init_artifactory(struct Delivery *ctx); + +int delivery_artifact_upload(struct Delivery *ctx); #endif //OMC_DELIVERABLE_H -- cgit