Trez/lunafreya-lva
4
0
Fork 0
Code Issues 1 Pull Requests Actions Activity

[DOCKER] Automated PR for docker-ovos-misc-modifications_2025-09-01T15-10-07 - #2 #2

Merged
gitea-sonarqube-bot merged 14 commits from docker-ovos-misc-modifications_2025-09-01T15-10-07 into main 2025-09-01 18:26:24 -04:00
Conversation 0 Commits 14 Files Changed 3
+8 -6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 229f71fa9c - Show all commits
.gitea/workflows/pr-docker-deploy.yml
+8 -6
View File
@@ -111,15 +111,16 @@ jobs:
for f in "${COMPOSE_FILES[@]}"; do for f in "${COMPOSE_FILES[@]}"; do
echo "Processing $f" echo "Processing $f"
# Create a safe filename by replacing slashes with underscores
safe_f=$(echo "$f" | sed 's|[./]|_|g') safe_f=$(echo "$f" | sed 's|[./]|_|g')
# Fetch main version # Fetch main version
git show origin/main:"$f" > "main_$f" 2>/dev/null || touch "main_$f" git show origin/main:"$f" > "main_${safe_f}" 2>/dev/null || touch "main_${safe_f}"
cp "$f" "head_$f" cp "$f" "head_${safe_f}"
# Extract services and append to global list # Extract services and append to global list
yq '.services | keys | .[]' "main_$f" >> services_main_all.txt 2>/dev/null || true yq '.services | keys | .[]' "main_${safe_f}" >> services_main_all.txt 2>/dev/null || true
yq '.services | keys | .[]' "head_$f" >> services_head_all.txt 2>/dev/null || true yq '.services | keys | .[]' "head_${safe_f}" >> services_head_all.txt 2>/dev/null || true
done done
# Sort and deduplicate # Sort and deduplicate
@@ -139,8 +140,9 @@ jobs:
service="{}" service="{}"
modified=0 modified=0
for f in "${COMPOSE_FILES[@]}"; do for f in "${COMPOSE_FILES[@]}"; do
yq ".services[\"$service\"]" "main_$f" > tmp_main.yml 2>/dev/null || continue safe_f=$(echo "$f" | sed "s|[./]|_|g")
yq ".services[\"$service\"]" "head_$f" > tmp_head.yml 2>/dev/null || continue yq ".services[\"$service\"]" "main_${safe_f}" > tmp_main.yml 2>/dev/null || continue
yq ".services[\"$service\"]" "head_${safe_f}" > tmp_head.yml 2>/dev/null || continue
if ! diff -q tmp_main.yml tmp_head.yml > /dev/null; then if ! diff -q tmp_main.yml tmp_head.yml > /dev/null; then
modified=1 modified=1
break break