diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2020-05-28 13:43:08 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-05-28 14:31:31 +0000 |
| commit | 07d825bd4c8a22d90bd3ce3b784aa06df5b03fce (patch) | |
| tree | 460de4b4775b4db64521c6cfb0d65ce8a403da9a | |
| parent | df6d95c3e10678288c39f0ee135d3f4d30aa0a36 (diff) | |
| download | qt-creator-07d825bd4c8a22d90bd3ce3b784aa06df5b03fce.tar.gz | |
GitHub Actions: Update Qt version to 5.15.0
Change-Id: I6da4c9a2b0d0b86729c19e8db3ac345d2d45666c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | .github/workflows/build_cmake.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index dc8a7ac4b7..f2dbb8dce6 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -3,7 +3,7 @@ name: CMake Build Matrix on: [push, pull_request] env: - QT_VERSION: 5.14.2 + QT_VERSION: 5.15.0 CLANG_VERSION: 80 CMAKE_VERSION: 3.17.0 NINJA_VERSION: 1.10.0 @@ -96,17 +96,17 @@ jobs: if ("${{ runner.os }}" STREQUAL "Windows") set(url_os "windows_x86") if ("x${{ matrix.config.environment_script }}" STREQUAL "x") - set(qt_package_arch_suffix "win64_mingw73") - set(qt_dir_prefix "${qt_version}/mingw73_64") - set(qt_package_suffix "-Windows-Windows_10-Mingw73-Windows-Windows_10-X86_64") + set(qt_package_arch_suffix "win64_mingw81") + set(qt_dir_prefix "${qt_version}/mingw81_64") + set(qt_package_suffix "-Windows-Windows_10-Mingw-Windows-Windows_10-X86_64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") - set(qt_package_arch_suffix "win64_msvc2017_64") - set(qt_dir_prefix "${qt_version}/msvc2017_64") - set(qt_package_suffix "-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64") + set(qt_package_arch_suffix "win64_msvc2019_64") + set(qt_dir_prefix "${qt_version}/msvc2019_64") + set(qt_package_suffix "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") - set(qt_package_arch_suffix "win32_msvc2017") - set(qt_dir_prefix "${qt_version}/msvc2017") - set(qt_package_suffix "-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86") + set(qt_package_arch_suffix "win32_msvc2019") + set(qt_dir_prefix "${qt_version}/msvc2019") + set(qt_package_suffix "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86") endif() elseif ("${{ runner.os }}" STREQUAL "Linux") set(url_os "linux_x64") |