feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

GitHub Actions: Update Qt version to 5.15.0

Browse Source 
Change-Id: I6da4c9a2b0d0b86729c19e8db3ac345d2d45666c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2020-05-28 13:43:08 +02:00
parent df6d95c3e1
commit 07d825bd4c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.github/workflows/build_cmake.yml vendored
View File

@@ -3,7 +3,7 @@ name: CMake Build Matrix
on: [push, pull_request] on: [push, pull_request]
env: env:
QT_VERSION: 5.14.2 QT_VERSION: 5.15.0
CLANG_VERSION: 80 CLANG_VERSION: 80
CMAKE_VERSION: 3.17.0 CMAKE_VERSION: 3.17.0
NINJA_VERSION: 1.10.0 NINJA_VERSION: 1.10.0
@@ -96,17 +96,17 @@ jobs:
if ("${{ runner.os }}" STREQUAL "Windows") if ("${{ runner.os }}" STREQUAL "Windows")
set(url_os "windows_x86") set(url_os "windows_x86")
if ("x${{ matrix.config.environment_script }}" STREQUAL "x") if ("x${{ matrix.config.environment_script }}" STREQUAL "x")
set(qt_package_arch_suffix "win64_mingw73") set(qt_package_arch_suffix "win64_mingw81")
set(qt_dir_prefix "${qt_version}/mingw73_64") set(qt_dir_prefix "${qt_version}/mingw81_64")
set(qt_package_suffix "-Windows-Windows_10-Mingw73-Windows-Windows_10-X86_64") set(qt_package_suffix "-Windows-Windows_10-Mingw-Windows-Windows_10-X86_64")
elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat")
set(qt_package_arch_suffix "win64_msvc2017_64") set(qt_package_arch_suffix "win64_msvc2019_64")
set(qt_dir_prefix "${qt_version}/msvc2017_64") set(qt_dir_prefix "${qt_version}/msvc2019_64")
set(qt_package_suffix "-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86_64") set(qt_package_suffix "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86_64")
elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat")
set(qt_package_arch_suffix "win32_msvc2017") set(qt_package_arch_suffix "win32_msvc2019")
set(qt_dir_prefix "${qt_version}/msvc2017") set(qt_dir_prefix "${qt_version}/msvc2019")
set(qt_package_suffix "-Windows-Windows_10-MSVC2017-Windows-Windows_10-X86") set(qt_package_suffix "-Windows-Windows_10-MSVC2019-Windows-Windows_10-X86")
endif() endif()
elseif ("${{ runner.os }}" STREQUAL "Linux") elseif ("${{ runner.os }}" STREQUAL "Linux")
set(url_os "linux_x64") set(url_os "linux_x64")