From 71f975de85fd4c887b4dec4fe1b66776904e826c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 22 Oct 2021 09:07:26 +0200 Subject: GitHub: Build against Qt Creator 6 snapshot with Qt 6.2 Change-Id: I5505a76d2ccb480eed5acbb90c7992cbba6f739d Reviewed-by: Cristian Adam --- .github/workflows/build_cmake.yml | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 77d5d8e..caa75ce 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,8 +4,8 @@ on: [push] env: PLUGIN_NAME: Fossil - QT_VERSION: 5.15.2 - QT_CREATOR_VERSION: 5.0.0-rc1 + QT_VERSION: 6.2.0 + QT_CREATOR_VERSION: 6.0.0-beta2 QT_CREATOR_SNAPSHOT: latest CMAKE_VERSION: 3.21.1 NINJA_VERSION: 1.10.2 @@ -112,37 +112,44 @@ jobs: set(url_os "linux_x64") set(qt_package_arch_suffix "gcc_64") set(qt_dir_prefix "${qt_version}/gcc_64") - set(qt_package_suffix "-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64") + set(qt_package_suffix "-Linux-RHEL_8_2-GCC-Linux-RHEL_8_2-X86_64") elseif ("${{ runner.os }}" STREQUAL "macOS") set(url_os "mac_x64") set(qt_package_arch_suffix "clang_64") - set(qt_dir_prefix "${qt_version}/clang_64") - set(qt_package_suffix "-MacOS-MacOS_10_13-Clang-MacOS-MacOS_10_13-X86_64") + set(qt_dir_prefix "${qt_version}/macos") + set(qt_package_suffix "-MacOS-MacOS_11_00-Clang-MacOS-MacOS_11_00-X86_64-ARM64") endif() - set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt5_${qt_version_dotless}") + set(qt_base_url "https://download.qt.io/online/qtsdkrepository/${url_os}/desktop/qt6_${qt_version_dotless}") file(DOWNLOAD "${qt_base_url}/Updates.xml" ./Updates.xml SHOW_PROGRESS) file(READ ./Updates.xml updates_xml) - string(REGEX MATCH "qt.qt5.*([0-9+-.]+)" updates_xml_output "${updates_xml}") + string(REGEX MATCH "qt.qt6.*([0-9+-.]+)" updates_xml_output "${updates_xml}") set(qt_package_version ${CMAKE_MATCH_1}) - file(MAKE_DIRECTORY qt5) + file(MAKE_DIRECTORY qt) # Save the path for other steps - file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt5/${qt_dir_prefix}" qt_dir) + file(TO_CMAKE_PATH "$ENV{GITHUB_WORKSPACE}/qt/${qt_dir_prefix}" qt_dir) message("::set-output name=qt_dir::${qt_dir}") message("Downloading Qt to ${qt_dir}") function(downloadAndExtract url archive) message("Downloading ${url}") file(DOWNLOAD "${url}" ./${archive} SHOW_PROGRESS) - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt5) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ../${archive} WORKING_DIRECTORY qt) endfunction() foreach(package qtbase qtdeclarative) downloadAndExtract( - "${qt_base_url}/qt.qt5.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" + ${package}.7z + ) + endforeach() + + foreach(package qt5compat qtshadertools) + downloadAndExtract( + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${package}.${qt_package_arch_suffix}/${qt_package_version}${package}${qt_package_suffix}.7z" ${package}.7z ) endforeach() @@ -150,7 +157,7 @@ jobs: # uic depends on libicu56.so if ("${{ runner.os }}" STREQUAL "Linux") downloadAndExtract( - "${qt_base_url}/qt.qt5.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z" + "${qt_base_url}/qt.qt6.${qt_version_dotless}.${qt_package_arch_suffix}/${qt_package_version}icu-linux-Rhel7.2-x64.7z" icu.7z ) endif() -- cgit v1.2.3 From 796bcbf4202b28df5b622778b87a04d33c4bc953 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 23 Nov 2021 11:45:01 +0100 Subject: Doc: Fix dependency to Qt Creator Change-Id: If7082978c204f8e5a84e40668b9aee26f0014668 Reviewed-by: Leena Miettinen --- doc/config/fossil.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/config/fossil.qdocconf b/doc/config/fossil.qdocconf index 290023f..98433df 100644 --- a/doc/config/fossil.qdocconf +++ b/doc/config/fossil.qdocconf @@ -10,7 +10,7 @@ include($$QTC_DOCS_DIR/config/qt-defines.qdocconf) sources.fileextensions = "*.qdoc" -depends += qt-creator +depends += qtcreator qhp.projects = fossil qhp.fossil.file = fossil.qhp -- cgit v1.2.3 From 9a351ad5f8a2a85c13eea40fa0a7fc4399b098af Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 2 Dec 2021 11:37:38 +0100 Subject: GitHub: Bump to QtC 6.0 and Qt 6.2.1 Change-Id: If36a5e7ca71f40ecb701b7fd3e66e7fe0bd1c47f Reviewed-by: Cristian Adam --- .github/workflows/build_cmake.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index caa75ce..8f77cd3 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -4,9 +4,9 @@ on: [push] env: PLUGIN_NAME: Fossil - QT_VERSION: 6.2.0 - QT_CREATOR_VERSION: 6.0.0-beta2 - QT_CREATOR_SNAPSHOT: latest + QT_VERSION: 6.2.1 + QT_CREATOR_VERSION: 6.0.0 + QT_CREATOR_SNAPSHOT: NO CMAKE_VERSION: 3.21.1 NINJA_VERSION: 1.10.2 -- cgit v1.2.3 From 1eb9263e315107fdd977c085282c6b8e2e41d691 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 26 Jan 2022 16:37:41 +0100 Subject: GitHub: Use checkout@v2 Fixes security concerns of v1 Change-Id: Ib62b3d51459d6e6d07bdacc63b9d2f7b4fcf584f Reviewed-by: Cristian Adam --- .github/workflows/build_cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 8f77cd3..23e2751 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -35,7 +35,7 @@ jobs: } steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Download Ninja and CMake shell: cmake -P {0} -- cgit v1.2.3