Jens/geointel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(deploy): ignore parent Git checkout in backup binding
Managed validation / Managed repository validation (pull_request) Successful in 2m16s
Details
GeoIntel release gates / Compile, test, contracts and builds (pull_request) Successful in 2m7s
Details
GeoIntel release gates / Python and npm vulnerability policy (pull_request) Successful in 26s
Details
GeoIntel release gates / Production AI image, SBOM and container scan (pull_request) Successful in 7m43s
Details
GeoIntel release gates / Deploy exact gated revision to Unraid (pull_request) Skipped
Details

Browse Source
This commit is contained in:
Jens
2026-08-30 13:32:22 +02:00
parent 9f771a61cf
commit bf5e1b7e06
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/tests/test_rc_backup_restore_scripts.py
+2
View File
@@ -45,6 +45,8 @@ def test_backup_binds_prepared_source_without_requiring_dot_git() -> None:
optional_git_fallback = script.index('if command -v git >/dev/null 2>&1') optional_git_fallback = script.index('if command -v git >/dev/null 2>&1')
docker_access = script.index("docker inspect -f '{{.State.Running}}'") docker_access = script.index("docker inspect -f '{{.State.Running}}'")
assert controller_resolution < optional_git_fallback < docker_access assert controller_resolution < optional_git_fallback < docker_access
assert 'git -C "$ROOT" rev-parse --show-toplevel' in script
assert '"$(cd "$git_top" && pwd -P)" = "$(cd "$ROOT" && pwd -P)"' in script
assert 'SOURCE_REVISION="$explicit_sha"' in script assert 'SOURCE_REVISION="$explicit_sha"' in script
assert '"backup_tool_revision": ${SOURCE_REVISION@Q}' in script assert '"backup_tool_revision": ${SOURCE_REVISION@Q}' in script
assert '"running_image_revision": ${RUNNING_IMAGE_REVISION@Q}' in script assert '"running_image_revision": ${RUNNING_IMAGE_REVISION@Q}' in script
scripts/backup_release_state.sh
+4 -1
View File
@@ -70,7 +70,7 @@ done
resolve_source_revision() { resolve_source_revision() {
local controller_sha="" explicit_sha="${GEOINTEL_BUILD_SHA:-}" local controller_sha="" explicit_sha="${GEOINTEL_BUILD_SHA:-}"
local gitea_sha="${GITEA_COMMIT_SHA:-}" github_sha="${GITHUB_SHA:-}" local gitea_sha="${GITEA_COMMIT_SHA:-}" github_sha="${GITHUB_SHA:-}"
local git_head="" git_dirty="false" source="" local git_head="" git_top="" git_dirty="false" source=""
if [ -n "$gitea_sha" ]; then if [ -n "$gitea_sha" ]; then
if ! [[ "$gitea_sha" =~ ^[0-9A-Fa-f]{40}$ ]]; then if ! [[ "$gitea_sha" =~ ^[0-9A-Fa-f]{40}$ ]]; then
@@ -115,6 +115,9 @@ resolve_source_revision() {
fi fi
if command -v git >/dev/null 2>&1 && git -C "$ROOT" rev-parse --git-dir >/dev/null 2>&1; then if command -v git >/dev/null 2>&1 && git -C "$ROOT" rev-parse --git-dir >/dev/null 2>&1; then
git_top="$(git -C "$ROOT" rev-parse --show-toplevel 2>/dev/null || true)"
fi
if [ -n "$git_top" ] && [ "$(cd "$git_top" && pwd -P)" = "$(cd "$ROOT" && pwd -P)" ]; then
git_head="$(git -C "$ROOT" rev-parse HEAD 2>/dev/null || true)" git_head="$(git -C "$ROOT" rev-parse HEAD 2>/dev/null || true)"
git_head="${git_head,,}" git_head="${git_head,,}"
if ! [[ "$git_head" =~ ^[0-9a-f]{40}$ ]]; then if ! [[ "$git_head" =~ ^[0-9a-f]{40}$ ]]; then