From fa07bd00670230480045b484a0a0bbb9639e9c53 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Wed, 16 Oct 2024 10:27:39 +0100 Subject: [PATCH] main-macos.yml log output extract CONFIGURE_ARGS --- .github/workflows/main-macos.yml | 36 ++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main-macos.yml b/.github/workflows/main-macos.yml index 89855047..bed3b615 100644 --- a/.github/workflows/main-macos.yml +++ b/.github/workflows/main-macos.yml @@ -92,14 +92,28 @@ jobs: - name: Build run: | export PATH="/opt/X11/bin:$PATH" - ./scripts/configure_mac + ./scripts/configure_mac 2>&1 | tee CONFIGURE.LOG + + config_log="" + if [ -f scripts/config.log ] + then + config_log="scripts/config.log" + elif [ -f build-magic/config.log ] + then + config_log="build-magic/config.log" + fi + if [ -n "$config_log" ] + then + CONFIGURE_ARGS=$(head -n 10 $config_log | egrep "./configure" | sed -e 's#^ *\$ ##' -e 's#./configure ##') + echo "CONFIGURE_ARGS=$CONFIGURE_ARGS" >> $GITHUB_ENV + fi echo "===== defs.mak =====" cat defs.mak echo "===== defs.mak =====" make database/database.h - make -j$(sysctl -n hw.ncpu) + make -j$(sysctl -n hw.ncpu) 2>&1 | tee MAKE.LOG - name: Install run: | @@ -213,14 +227,28 @@ jobs: - name: Build run: | export PATH="/opt/X11/bin:$PATH" - ./scripts/configure_mac + ./scripts/configure_mac 2>&1 | tee CONFIGURE.LOG + + config_log="" + if [ -f scripts/config.log ] + then + config_log="scripts/config.log" + elif [ -f build-magic/config.log ] + then + config_log="build-magic/config.log" + fi + if [ -n "$config_log" ] + then + CONFIGURE_ARGS=$(head -n 10 $config_log | egrep "./configure" | sed -e 's#^ *\$ ##' -e 's#./configure ##') + echo "CONFIGURE_ARGS=$CONFIGURE_ARGS" >> $GITHUB_ENV + fi echo "===== defs.mak =====" cat defs.mak echo "===== defs.mak =====" make database/database.h - make -j$(sysctl -n hw.ncpu) + make -j$(sysctl -n hw.ncpu) 2>&1 | tee MAKE.LOG - name: Install run: |