@@ -310,62 +310,24 @@ jobs:
310310 # When using rsync, you can define copyback: false to not copy files back from the VM in to the host.
311311 copyback : false
312312 prepare : |
313- pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6 tidy-html5
314- echo "=== tidy-html5 package info ==="
315- pkg info tidy-html5
316- echo "=== tidy-html5 installed files ==="
317- pkg info -l tidy-html5
318- echo "=== Searching for tidy headers ==="
319- find /usr/local -name "*tidy*" -type f 2>/dev/null || true
320- echo "=== Searching for tidy libraries ==="
321- find /usr/local -name "*tidy*" -type f -name "*.so*" -o -name "*.a" 2>/dev/null || true
322- echo "=== PKG_CONFIG_PATH and pkg-config info ==="
323- echo "PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
324- pkg-config --list-all | grep -i tidy || echo "No tidy found in pkg-config"
325- echo "=== /usr/local/lib contents (tidy related) ==="
326- ls -la /usr/local/lib/ | grep -i tidy || echo "No tidy libs found in /usr/local/lib"
327- echo "=== /usr/local/include contents (tidy related) ==="
328- find /usr/local/include -name "*tidy*" -type f 2>/dev/null || echo "No tidy headers found in /usr/local/include"
313+ pkg install -y cmake git eigen glm exiv2 nlopt fast_float md4c qxlsx-qt6 perl5 xorg-vfbserver gettext qt6 tidy-html5 pkgconf
329314
330315 run : |
331316 set -e -x
332317 export DISPLAY=:0
333- echo "=== Environment variables before build ==="
334- echo "CMAKE_PREFIX_PATH: $CMAKE_PREFIX_PATH"
335- echo "PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
336- echo "LD_LIBRARY_PATH: $LD_LIBRARY_PATH"
337- echo "=== Setting up environment for tidy detection ==="
338318 export CMAKE_PREFIX_PATH="/usr/local:$CMAKE_PREFIX_PATH"
339319 export PKG_CONFIG_PATH="/usr/local/libdata/pkgconfig:$PKG_CONFIG_PATH"
340- echo "Updated CMAKE_PREFIX_PATH: $CMAKE_PREFIX_PATH"
341- echo "Updated PKG_CONFIG_PATH: $PKG_CONFIG_PATH"
342- echo "=== Testing pkg-config for tidy ==="
343- which pkg-config || echo "pkg-config not found, installing..."
344- pkg install -y pkgconf || true
345- pkg-config --exists tidy && echo "tidy found via pkg-config" || echo "tidy not found via pkg-config"
346- pkg-config --cflags --libs tidy 2>/dev/null || echo "Failed to get tidy flags"
347- echo "=== Creating missing libtidy.so symlink ==="
348- ls -la /usr/local/lib/libtidy*
320+ # Create missing libtidy.so symlink
349321 if [ ! -e /usr/local/lib/libtidy.so ]; then
350322 ln -sf /usr/local/lib/libtidy.so.58 /usr/local/lib/libtidy.so
351- echo "Created symlink: /usr/local/lib/libtidy.so -> /usr/local/lib/libtidy.so.58"
352323 fi
353- ls -la /usr/local/lib/libtidy*
354324 mkdir builds
355325 cd builds
356- echo "=== Running CMake with verbose output ==="
357326 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSTELLARIUM_RELEASE_BUILD=Off -DENABLE_TESTING=On \
358- -DCMAKE_VERBOSE_MAKEFILE=ON --debug-output \
359327 -DCMAKE_PREFIX_PATH="/usr/local" \
360- -DLibTidy_ROOT="/usr/local" \
361328 -DLIBTIDY_INCLUDE_DIR="/usr/local/include" \
362329 -DLIBTIDY_LIBRARY="/usr/local/lib/libtidy.so" \
363330 "${{ github.workspace }}"
364- echo "=== CMake cache contents (tidy related) ==="
365- grep -i tidy CMakeCache.txt || echo "No tidy entries found in CMakeCache.txt"
366- echo "=== CMake configuration summary ==="
367- cmake -LA . | grep -i tidy || echo "No tidy configuration found"
368- echo "=== Starting build ==="
369331 make -j3
370332 Xvfb :0 -ac -screen 0 1024x768x24+32 >/dev/null 2>&1 &
371333 sleep 3
0 commit comments