diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 600f0a0..c819564 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,10 +58,11 @@ jobs: - name: Get Qt run: python ./share/ci/get_qt.py - - name: Get dependencies - run: | - python ./share/ci/get_leptonica.py - python ./share/ci/get_tesseract.py + - name: Get leptonica + run: python ./share/ci/get_leptonica.py + + - name: Get tesseract + run: python ./share/ci/get_tesseract.py - name: Build run: python ./share/ci/build.py diff --git a/share/ci/common.py b/share/ci/common.py index 47b76c2..0aee8b3 100644 --- a/share/ci/common.py +++ b/share/ci/common.py @@ -206,6 +206,8 @@ def apply_cmd_env(cmd): key, value = match.groups() if key in os.environ and os.environ[key] == value: continue + if key in os.environ: + print('Changing', key, '\nfrom\n', os.environ[key], '\nto\n', value) if is_mingw and key.find('PATH') != -1 and value.find('/') != -1: value = value.replace(':', ';') value = re.sub(r'/(\w)/', r'\1:\\', value) diff --git a/share/ci/get_leptonica.py b/share/ci/get_leptonica.py index e31fe82..5924b4b 100644 --- a/share/ci/get_leptonica.py +++ b/share/ci/get_leptonica.py @@ -69,3 +69,7 @@ c.set_make_threaded() c.run('cmake {}'.format(cmake_args)) c.run('cmake --build . --config Release') c.run('cmake --build . --target install --config Release') + +if not check_existing(): # create links + c.print('>> Build failed') + exit(1) diff --git a/share/ci/get_tesseract.py b/share/ci/get_tesseract.py index 0c89e5b..a916561 100644 --- a/share/ci/get_tesseract.py +++ b/share/ci/get_tesseract.py @@ -72,3 +72,7 @@ c.set_make_threaded() c.run('cmake {}'.format(cmake_args)) c.run('cmake --build . --config Release') c.run('cmake --build . --target install --config Release') + +if not check_existing(): # create links + c.print('>> Build failed') + exit(1)