diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-12-10 17:55:24 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-12-14 09:42:40 +0000 |
| commit | 962918629bc83a4da291b8f30ff4d9caabf43e21 (patch) | |
| tree | d3e4b0f99aff5cdfab47916d72c254ae62099dfd /.github/workflows/build_cmake.yml | |
| parent | 4b33979bcdac3541163ad5a48ed1964999896ba6 (diff) | |
qbs: fix installing doc dependenices on macOS and Windows
python still aliases to python 2.7 on macOS, so we need a smarter way to
find python3.
Change-Id: I229d8c1e124fb599119991b44c0f6d88d39b1684
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to '.github/workflows/build_cmake.yml')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index a0c7ca5e88..a72eb318ef 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -330,8 +330,12 @@ jobs: message(FATAL_ERROR "Failed to install dependencies") endif() endif() + find_package(Python3 REQUIRED COMPONENTS Interpreter) + # hack to replace 32-bit python found by this script with 64-bit one + # required for linking qtcreatorcdbext + string(REPLACE "x86" "x64" Python3_EXECUTABLE "${Python3_EXECUTABLE}") execute_process( - COMMAND python -m pip install --user beautifulsoup4 lxml + COMMAND ${Python3_EXECUTABLE} -m pip install --user beautifulsoup4 lxml RESULT_VARIABLE result ) if (NOT result EQUAL 0) @@ -394,6 +398,9 @@ jobs: set(ELFUTILS_OPTION) endif() + find_package(Python3 REQUIRED COMPONENTS Interpreter) + string(REPLACE "x86" "x64" Python3_EXECUTABLE "${Python3_EXECUTABLE}") + execute_process( COMMAND python -u @@ -403,6 +410,7 @@ jobs: --build build --qt-path "${{ steps.qt.outputs.qt_dir }}" --llvm-path "${{ steps.libclang.outputs.libclang_dir }}" + --python3 "${Python3_EXECUTABLE}" --with-tests ${CDB_OPTION} ${ELFUTILS_OPTION} |