diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-08-19 13:45:48 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-08-19 15:50:37 +0000 |
| commit | d6c3846ab1c26ba6a1e6aea7df6e2119d50e9d4b (patch) | |
| tree | 1379a7340a4d12056baa780dbcfbf95952a6efbb /.github | |
| parent | eb0d2518f9dac0a862ddc0847aa570bac1c347d0 (diff) | |
CMake Build: Add Google Testing 1.10.x as submodule
Fixes: QTCREATORBUG-24510
Change-Id: I763d72524f2e581671e18bcd9cda42d5bf7bccdf
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/build_cmake.yml | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index adedd221dc..7db35e831a 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -10,7 +10,6 @@ env: NINJA_VERSION: 1.10.0 BUILD_TYPE: Release CCACHE_VERSION: 3.7.7 - GOOGLETEST_VERSION: 1.10.0 jobs: build: @@ -51,6 +50,7 @@ jobs: git submodule set-url -- perfparser https://code.qt.io/qt-creator/perfparser.git git submodule update --init src/plugins/help/qlitehtml/litehtml git submodule update --init src/tools/perfparser + git submodule update --init tests/unit/unittest/3rdparty/googletest - name: Download Ninja and CMake id: cmake_and_ninja @@ -330,16 +330,6 @@ jobs: endif() endif() - - name: Download Googletest - id: googletest - shell: cmake -P {0} - run: | - # Googletest should be a submodule - file(DOWNLOAD "https://github.com/google/googletest/archive/release-$ENV{GOOGLETEST_VERSION}.tar.gz" ./googletest.tar.gz SHOW_PROGRESS) - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf googletest.tar.gz) - file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/googletest-release-$ENV{GOOGLETEST_VERSION}" googletest_dir) - message("::set-output name=googletest_dir::${googletest_dir}") - - name: Build shell: cmake -P {0} run: | @@ -366,8 +356,6 @@ jobs: endif() set(ENV{PATH} "${{ steps.cmake_and_ninja.outputs.cmake_dir }}${path_separator}$ENV{GITHUB_WORKSPACE}${path_separator}$ENV{PATH}") - set(ENV{GOOGLETEST_DIR} "${{ steps.googletest.outputs.googletest_dir }}") - set(ENV{NINJA_STATUS} "[%f/%t %o/sec] ") file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}" ccache_basedir) |