use the node-ffmpeg trick to display conan output

mmomtchev · Jan 15, 2024 · 350cfb8 · 350cfb8
1 parent dc96fa0
commit 350cfb8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/test-dev.yml b/.github/workflows/test-dev.yml
@@ -43,9 +43,6 @@ jobs:
       - run: npm install --ignore-scripts
       - run: npm run deps:download
       - run: npx @mapbox/node-pre-gyp configure
-      - name: conan.log
-        run: cat build/conan.log
-        if: runner.os != 'Windows'
       - name: magick_configure.log
         run: cat build/magick_configure.log
         shell: bash
@@ -126,8 +123,6 @@ jobs:
       - run: npm install --ignore-scripts
       - run: npm run deps:download
       - run: npx @mapbox/node-pre-gyp configure --nodedir=./emscripten --target_arch=wasm32 --target_platform=emscripten
-      - name: conan.log
-        run: cat build/conan.log
       - name: magick_configure.log
         run: cat build/magick_configure.log
         shell: bash
@@ -177,9 +172,6 @@ jobs:
             --jbig=false --cms=false --xml=false --gzip=false --zip=false            \
             --bzip2=false --zstd=false --xz=false --lzma=false --simd=false          \
             --openmp=false --display=false
-      - name: conan.log
-        run: cat build/conan.log
-        shell: bash
       - name: magick_configure.log
         run: cat build/magick_configure.log
         shell: bash

diff --git a/builtins.gypi b/builtins.gypi
@@ -35,7 +35,7 @@
           ' -osimd=<!(node <(module_root_dir)/scripts/true-false.js <(simd))'
           ' -oopenmp=<!(node <(module_root_dir)/scripts/true-false.js <(openmp))'
           ' -odisplay=<!(node <(module_root_dir)/scripts/true-false.js <(display))'
-          ' > conan.log 2>&1 )'
+          ' 1>&2 )'
       }
     }],
     ['target_platform != "emscripten"', {
@@ -69,7 +69,7 @@
           ' -osimd=<!(node <(module_root_dir)/scripts/true-false.js <(simd))'
           ' -oopenmp=<!(node <(module_root_dir)/scripts/true-false.js <(openmp))'
           ' -odisplay=<!(node <(module_root_dir)/scripts/true-false.js <(display))'
-          ' > conan.log 2>&1 )'
+          ' 1>&2 )'
       }
     }]
   ]