aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-08-08 12:13:12 -0400
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-08-08 12:22:54 -0400
commitd04b0b8992c0d68139e824de17d83ac49f65935a (patch)
tree94b94a6c71fc1f8640f6ed6798b9c55c90056b02
parent23e650d0b9f8bf194921a0fc0b467235df021af6 (diff)
downloadstasis-d04b0b8992c0d68139e824de17d83ac49f65935a.tar.gz
delivery_init: add render_mode argument
-rw-r--r--include/delivery.h5
-rw-r--r--src/delivery.c4
-rw-r--r--tests/rt_generic.sh2
3 files changed, 5 insertions, 6 deletions
diff --git a/include/delivery.h b/include/delivery.h
index 969c803..067cd0b 100644
--- a/include/delivery.h
+++ b/include/delivery.h
@@ -191,12 +191,11 @@ struct Delivery {
/**
* Initializes a Deliver structure
* @param ctx pointer to Delivery context
- * @param ini pointer to INIFILE describing a delivery
- * @param cfg pointer to INIFILE describing extra configuration data
+ * @param render_mode INI_READ_RAW or INI_READ_RENDER
* @return `0` on success
* @return Non-zero on error
*/
-int delivery_init(struct Delivery *ctx);
+int delivery_init(struct Delivery *ctx, int render_mode);
/**
* Free memory allocated by delivery_init()
diff --git a/src/delivery.c b/src/delivery.c
index 1ff1c14..ce6e804 100644
--- a/src/delivery.c
+++ b/src/delivery.c
@@ -674,7 +674,7 @@ int *bootstrap_build_info(struct Delivery *ctx) {
return 0;
}
-int delivery_init(struct Delivery *ctx) {
+int delivery_init(struct Delivery *ctx, int render_mode) {
populate_info(ctx);
populate_delivery_cfg(ctx, INI_READ_RENDER);
@@ -718,7 +718,7 @@ int delivery_init(struct Delivery *ctx) {
// Prevent git from paginating output
setenv("GIT_PAGER", "", 1);
- populate_delivery_ini(ctx, 0);
+ populate_delivery_ini(ctx, render_mode);
if (ctx->deploy.docker.tags) {
for (size_t i = 0; i < strlist_count(ctx->deploy.docker.tags); i++) {
diff --git a/tests/rt_generic.sh b/tests/rt_generic.sh
index 600e501..df39dbd 100644
--- a/tests/rt_generic.sh
+++ b/tests/rt_generic.sh
@@ -39,7 +39,7 @@ pushd "$ws"
echo
echo "#### Contents ####"
- files=$(find stasis/*/output -type f \( -name '*.yml' -o -name '*.md' -o -name '*.stasis' \) | sort)
+ files=$(find stasis/*/output -type f \( -name '*.yml' -o -name '*.md' -o -name '*.stasis' -o -name '*.ini' \) | sort)
for x in $files; do
echo
echo "FILENAME: $x"