build fix
This commit is contained in:
@@ -54,7 +54,7 @@ steps:
|
|||||||
depends_on: [ secrets ]
|
depends_on: [ secrets ]
|
||||||
commands:
|
commands:
|
||||||
- set -euo pipefail 2>/dev/null || set -eu
|
- set -euo pipefail 2>/dev/null || set -eu
|
||||||
- bash ci/pipelines/fx/ensure_env_version.sh
|
- sh ci/pipelines/fx/ensure_env_version.sh
|
||||||
- sed -i 's/\r$//' ./ci/prod/.env.runtime
|
- sed -i 's/\r$//' ./ci/prod/.env.runtime
|
||||||
- sed -i 's/\r$//' ./.env.version
|
- sed -i 's/\r$//' ./.env.version
|
||||||
- set -a
|
- set -a
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#!/usr/bin/env bash
|
#!/bin/sh
|
||||||
set -euo pipefail
|
set -eu
|
||||||
|
|
||||||
regen_env_version() {
|
regen_env_version() {
|
||||||
echo "[fx-pipeline] regenerating .env.version defaults" >&2
|
echo "[fx-pipeline] regenerating .env.version defaults" >&2
|
||||||
local git_rev branch app_v build_date build_user
|
|
||||||
if [[ -n "${WOODPECKER_COMMIT:-}" ]]; then
|
if [ -n "${WOODPECKER_COMMIT:-}" ]; then
|
||||||
git_rev="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
|
git_rev="$(printf '%s' "${WOODPECKER_COMMIT}" | cut -c1-7)"
|
||||||
elif command -v git >/dev/null 2>&1; then
|
elif command -v git >/dev/null 2>&1; then
|
||||||
git_rev="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
|
git_rev="$(git rev-parse --short HEAD 2>/dev/null || echo dev)"
|
||||||
@@ -12,7 +12,7 @@ regen_env_version() {
|
|||||||
git_rev="dev"
|
git_rev="dev"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${WOODPECKER_BRANCH:-}" ]]; then
|
if [ -n "${WOODPECKER_BRANCH:-}" ]; then
|
||||||
branch="${WOODPECKER_BRANCH}"
|
branch="${WOODPECKER_BRANCH}"
|
||||||
elif command -v git >/dev/null 2>&1; then
|
elif command -v git >/dev/null 2>&1; then
|
||||||
branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
|
branch="$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo local)"
|
||||||
@@ -20,7 +20,7 @@ regen_env_version() {
|
|||||||
branch="local"
|
branch="local"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -f version ]]; then
|
if [ -f version ]; then
|
||||||
app_v="$(cat version 2>/dev/null || echo dev)"
|
app_v="$(cat version 2>/dev/null || echo dev)"
|
||||||
else
|
else
|
||||||
app_v="dev"
|
app_v="dev"
|
||||||
@@ -34,12 +34,11 @@ regen_env_version() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ensure_env_version() {
|
ensure_env_version() {
|
||||||
if [[ ! -s ./.env.version ]]; then
|
if [ ! -s ./.env.version ]; then
|
||||||
regen_env_version
|
regen_env_version
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local tmp
|
|
||||||
tmp="$(mktemp)"
|
tmp="$(mktemp)"
|
||||||
if ! grep -E '^[[:space:]]*[A-Za-z_][A-Za-z0-9_]*=' ./.env.version >"$tmp"; then
|
if ! grep -E '^[[:space:]]*[A-Za-z_][A-Za-z0-9_]*=' ./.env.version >"$tmp"; then
|
||||||
rm -f "$tmp"
|
rm -f "$tmp"
|
||||||
@@ -47,7 +46,7 @@ ensure_env_version() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ ! -s "$tmp" ]]; then
|
if [ ! -s "$tmp" ]; then
|
||||||
rm -f "$tmp"
|
rm -f "$tmp"
|
||||||
regen_env_version
|
regen_env_version
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user