diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2021-10-18 11:46:46 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2021-10-18 14:20:03 +0000 |
| commit | 4544d891aa32255ec02385609c133c9685c9c72f (patch) | |
| tree | f0ff492bff32e812750760caea9a52e917f74452 /.github | |
| parent | 73fa76f776a2a9fbc3ea4f77a799afb35fc5d87c (diff) | |
| download | qt-creator-4544d891aa32255ec02385609c133c9685c9c72f.tar.gz | |
GitHub Actions: Do not build qbs with Qt Creator
Due to the recent changes that broke the MinGW 8.1 compilation and
the qbs documentation python issues with both MinGW and MSVC.
Change-Id: I401c2a1bd8f31de8fc7e44bb060247df75d9d1a0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 15cab0d19f..3efc8a7b46 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -387,17 +387,6 @@ 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 ${Python3_EXECUTABLE} -m pip install --user beautifulsoup4 lxml - RESULT_VARIABLE result - ) - if (NOT result EQUAL 0) - message(FATAL_ERROR "Failed to install python dependencies") - endif() - name: Build shell: cmake -P {0} @@ -480,6 +469,7 @@ jobs: --add-config=-DCMAKE_CXX_COMPILER_LAUNCHER=ccache --add-config=-DIDE_REVISION_URL=https://github.com/$ENV{GITHUB_REPOSITORY}/commits/$ENV{GITHUB_SHA} --zip-infix=-${{ matrix.config.artifact }}-${{ github.run_id }} + --no-qbs RESULT_VARIABLE result COMMAND_ECHO STDOUT OUTPUT_VARIABLE output |