Skip to content

Commit 2b36046

Browse files
committed
fix4
1 parent eb313f5 commit 2b36046

1 file changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/automatic_image_genration.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ jobs:
182182
# Generate PNG with full debugging
183183
echo ""
184184
echo "🖼️ Generating PNG for: $file"
185-
echo "📜 Command: java -jar /tmp/plantuml.jar -v -tpng '$file' -o '$output_abs'"
185+
echo "📜 Command: java -jar /tmp/plantuml.jar -v -tpng "$file" -o "$output_abs" -filename "${prefix_base}" > /tmp/plantuml-png.log 2>&1
186+
png_exit_code=$?
186187
187188
java -jar /tmp/plantuml.jar -v -tpng "$file" -o "$output_abs" -filename "${prefix_base}" > /tmp/plantuml-png.log 2>&1
188189
png_exit_code=$?
@@ -201,15 +202,16 @@ jobs:
201202
202203
# Look for PNG files
203204
if [ -f "$output_abs/${prefix_base}.png" ]; then
204-
echo "✅ Generated PNG: ${{ env.PLANTUML_PREFIX }}${base}.png"
205+
echo "✅ Generated PNG: ${prefix_base}.png"
205206
else
206-
echo "❌ Expected PNG not found: $output_abs/${base}.png"
207+
echo "❌ Expected PNG not found: $output_abs/${prefix_base}.png"
207208
fi
208209
209210
# Generate SVG with full debugging
210211
echo ""
211212
echo "🎭 Generating SVG for: $file"
212-
echo "📜 Command: java -jar /tmp/plantuml.jar -v -tsvg '$file' -o '$output_abs'"
213+
echo "📜 Command: java -jar /tmp/plantuml.jar -v -tsvg "$file" -o "$output_abs" -filename "$prefix_base" > /tmp/plantuml-svg.log 2>&1
214+
svg_exit_code=$?
213215
214216
java -jar /tmp/plantuml.jar -v -tsvg "$file" -o "$output_abs" -filename "$prefix_base" > /tmp/plantuml-svg.log 2>&1
215217
svg_exit_code=$?
@@ -224,9 +226,9 @@ jobs:
224226
225227
# Check for SVG files
226228
if [ -f "$output_abs/${prefix_base}.svg" ]; then
227-
echo "✅ Generated SVG: ${{ env.PLANTUML_PREFIX }}${base}.svg"
229+
echo "✅ Generated SVG: ${prefix_base}.svg"
228230
else
229-
echo "❌ Expected SVG not found: $output_abs/${base}.svg"
231+
echo "❌ Expected SVG not found: $output_abs/${prefix_base}.svg"
230232
fi
231233
232234
echo "📁 Final output directory state:"
@@ -284,17 +286,17 @@ jobs:
284286
-v $(pwd):/data \
285287
rlespinasse/drawio-export:4.4.0 \
286288
--format png \
287-
--output "${{ env.OUTPUT_DIR }}" \
288-
"$prefix_base" 2>&1 | sed 's/^/ | /'
289+
--output "${{ env.OUTPUT_DIR }}/"$prefix_base" \
290+
2>&1 | sed 's/^/ | /'
289291
290292
png_exit_code=${PIPESTATUS[0]}
291293
echo "📊 Docker PNG exit code: $png_exit_code"
292294
293-
# Check for file with diagram- prefix (already created correctly!)
294-
if [ -f "${{ env.OUTPUT_DIR }}/diagram-${prefix_base}.png" ]; then
295-
echo "✅ Generated PNG: diagram-${prefix_base}.png"
295+
# Check for file
296+
if [ -f "${{ env.OUTPUT_DIR }}/${prefix_base}.png" ]; then
297+
echo "✅ Generated PNG: ${prefix_base}.png"
296298
else
297-
echo "❌ PNG not created: diagram-${prefix_base}.png"
299+
echo "❌ PNG not created: ${prefix_base}.png"
298300
fi
299301
300302
# Generate SVG with debugging
@@ -305,17 +307,17 @@ jobs:
305307
-v $(pwd):/data \
306308
rlespinasse/drawio-export:4.4.0 \
307309
--format svg \
308-
--output "${{ env.OUTPUT_DIR }}" \
309-
"$prefix_base" 2>&1 | sed 's/^/ | /'
310+
--output "${{ env.OUTPUT_DIR }}/"$prefix_base" \
311+
2>&1 | sed 's/^/ | /'
310312
311313
svg_exit_code=${PIPESTATUS[0]}
312314
echo "📊 Docker SVG exit code: $svg_exit_code"
313315
314-
# Check for file with diagram- prefix (already created correctly!)
315-
if [ -f "${{ env.OUTPUT_DIR }}/diagram-${prefix_base}.svg" ]; then
316-
echo "✅ Generated SVG: diagram-${prefix_base}.svg (already correctly prefixed)"
316+
# Check for file
317+
if [ -f "${{ env.OUTPUT_DIR }}/${prefix_base}.svg" ]; then
318+
echo "✅ Generated SVG: ${prefix_base}.svg (already correctly prefixed)"
317319
else
318-
echo "❌ SVG not created: diagram-${prefix_base}.svg"
320+
echo "❌ SVG not created: ${prefix_base}.svg"
319321
fi
320322
321323
echo "📁 Final output directory state:"

0 commit comments

Comments
 (0)