From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 12 Mar 2026 00:10:58 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:56 12.03.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=55914108481f427647d7300b30f9ffa1fce8a815;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:56 12.03.2026. --- diff --git a/bin/check_repo.sh b/bin/check_repo.sh index 2f6072817..088e137b9 100755 --- a/bin/check_repo.sh +++ b/bin/check_repo.sh @@ -6,7 +6,7 @@ dirty="$(git ls-files -u || true)" lsfiles="$(git ls-files --others --exclude-standard || true)" # Conflict or unresolved state: stop and notify. -if [[ -n "$dirty" ]] || git diff --check --quiet; then +if [[ -n "$dirty" ]]; then echo "[check_repo] repo has conflicts, stop" bash bin/notify_telegram.sh "STOP: repo conflicts in $(pwd)" exit 1 diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index b8f1ab7c8..a03728e8c 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -16,9 +16,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/147/46017c6f"; +:global CommitId "main/148/88fb8eb0"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:08:05 12.03.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 03:10:57 12.03.2026."; # The variables are received right here. :global GlobalConfVersion 138;