tech/sendico
2
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fx build fix
Some checks failed
ci/woodpecker/push/db Pipeline was successful
Details
ci/woodpecker/push/fx/1 Pipeline failed
Details
ci/woodpecker/push/fx/2 Pipeline failed
Details
ci/woodpecker/push/nats Pipeline was successful
Details

Browse Source
This commit is contained in:
Stephan D
2025-11-07 23:55:41 +01:00
parent 2ee17b0c46
commit 590fad0071
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ci/pipelines/fx/build.sh
View File

@@ -6,10 +6,14 @@ if ! set -o pipefail 2>/dev/null; then
fi fi
sh ci/pipelines/fx/ensure_env_version.sh sh ci/pipelines/fx/ensure_env_version.sh
sed -i 's/\r$//' ./ci/prod/.env.runtime normalize_env_file() {
sed -i 's/\r$//' ./.env.version file="$1"
tmp="${file}.tmp.$$"
tr -d '\r' <"$file" >"$tmp"
mv "$tmp" "$file"
}
lc_load_env_file() { load_env_file() {
file="$1" file="$1"
while IFS= read -r line || [ -n "$line" ]; do while IFS= read -r line || [ -n "$line" ]; do
case "$line" in case "$line" in
@@ -20,13 +24,15 @@ lc_load_env_file() {
key="$(printf '%s' "$key" | tr -d '[:space:]')" key="$(printf '%s' "$key" | tr -d '[:space:]')"
value="${value#"${value%%[![:space:]]*}"}" value="${value#"${value%%[![:space:]]*}"}"
value="${value%"${value##*[![:space:]]}"}" value="${value%"${value##*[![:space:]]}"}"
value="${value%$'\r'}"
export "$key=$value" export "$key=$value"
done <"$file" done <"$file"
} }
lc_load_env_file ./ci/prod/.env.runtime normalize_env_file ./ci/prod/.env.runtime
lc_load_env_file ./.env.version normalize_env_file ./.env.version
load_env_file ./ci/prod/.env.runtime
load_env_file ./.env.version
REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}" REGISTRY_URL="${REGISTRY_URL:?missing REGISTRY_URL}"
APP_V="${APP_V:?missing APP_V}" APP_V="${APP_V:?missing APP_V}"

18
ci/pipelines/fx/deploy.sh
View File

@@ -6,10 +6,14 @@ if ! set -o pipefail 2>/dev/null; then
fi fi
sh ci/pipelines/fx/ensure_env_version.sh sh ci/pipelines/fx/ensure_env_version.sh
sed -i 's/\r$//' ./ci/prod/.env.runtime normalize_env_file() {
sed -i 's/\r$//' ./.env.version file="$1"
tmp="${file}.tmp.$$"
tr -d '\r' <"$file" >"$tmp"
mv "$tmp" "$file"
}
lc_load_env_file() { load_env_file() {
file="$1" file="$1"
while IFS= read -r line || [ -n "$line" ]; do while IFS= read -r line || [ -n "$line" ]; do
case "$line" in case "$line" in
@@ -20,13 +24,15 @@ lc_load_env_file() {
key="$(printf '%s' "$key" | tr -d '[:space:]')" key="$(printf '%s' "$key" | tr -d '[:space:]')"
value="${value#"${value%%[![:space:]]*}"}" value="${value#"${value%%[![:space:]]*}"}"
value="${value%"${value##*[![:space:]]}"}" value="${value%"${value##*[![:space:]]}"}"
value="${value%$'\r'}"
export "$key=$value" export "$key=$value"
done <"$file" done <"$file"
} }
lc_load_env_file ./ci/prod/.env.runtime normalize_env_file ./ci/prod/.env.runtime
lc_load_env_file ./.env.version normalize_env_file ./.env.version
load_env_file ./ci/prod/.env.runtime
load_env_file ./.env.version
FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}" FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}" FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"