From c0d328e0e6cc77489fecfcd89a8d4e024e9613d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Fri, 6 Dec 2024 11:20:19 +0100 Subject: [PATCH 1/3] feat: require minimum Qt6.7 --- .drone.star | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index 27855ef271c..9d14bfb3949 100644 --- a/.drone.star +++ b/.drone.star @@ -22,7 +22,7 @@ OC_UBUNTU = "owncloud/ubuntu:20.04" # Eventually, we have to use image built on ubuntu # Todo: update or remove the following images # https://github.com/owncloud/client/issues/10070 -OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-39-amd64" +OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-41-amd64" OC_CI_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64" PLUGINS_GIT_ACTION = "plugins/git-action:1" diff --git a/CMakeLists.txt b/CMakeLists.txt index a435ec0eb99..0ac9bd7cb33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ set(APPLE_SUPPRESS_X11_WARNING ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) -find_package(QT 6.5 NAMES Qt6 COMPONENTS Core REQUIRED) +find_package(QT 6.7 NAMES Qt6 COMPONENTS Core REQUIRED) find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml Quick QuickWidgets QuickControls2 REQUIRED) find_package(Qt6LinguistTools REQUIRED) From e7b0805bc65ff9239472f03163941b9ff202d35d Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Mon, 9 Dec 2024 09:54:11 +0545 Subject: [PATCH 2/3] chore: bump squish image --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 9d14bfb3949..445864381d8 100644 --- a/.drone.star +++ b/.drone.star @@ -23,7 +23,7 @@ OC_UBUNTU = "owncloud/ubuntu:20.04" # Todo: update or remove the following images # https://github.com/owncloud/client/issues/10070 OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-41-amd64" -OC_CI_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64" +OC_CI_SQUISH = "owncloudci/squish:fedora-39-8.0.0-qt67x-linux64" PLUGINS_GIT_ACTION = "plugins/git-action:1" PLUGINS_S3 = "plugins/s3:1.4.0" From 0b5f2721dde47acdda8544e103ca3bc5e86a4afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Mon, 9 Dec 2024 11:23:42 +0100 Subject: [PATCH 3/3] ci: drop unit test pipeline from drone --- .drone.star | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/.drone.star b/.drone.star index 445864381d8..d072e853cdd 100644 --- a/.drone.star +++ b/.drone.star @@ -134,13 +134,11 @@ def main(ctx): pipelines = check_starlark() + \ lint_gui_test() + \ changelog(ctx) - unit_tests = unit_test_pipeline(ctx) gui_tests = gui_test_pipeline(ctx) return pipelines + \ - unit_tests + \ gui_tests + \ - pipelinesDependsOn(notification(), unit_tests + gui_tests) + pipelinesDependsOn(notification(), gui_tests) def from_secret(name): return { @@ -181,22 +179,6 @@ def check_starlark(): }, }] -def unit_test_pipeline(ctx): - return [{ - "kind": "pipeline", - "name": "unit-tests", - "platform": { - "os": "linux", - "arch": "amd64", - }, - "steps": skipIfUnchanged(ctx, "unit-tests") + - build_client(OC_CI_CLIENT_FEDORA) + - unit_tests(OC_CI_CLIENT_FEDORA), - "trigger": { - "ref": trigger_ref, - }, - }] - def gui_test_pipeline(ctx): pipelines = [] for server, params in config["gui-tests"]["servers"].items(): @@ -301,21 +283,6 @@ def build_client(image = OC_CI_CLIENT, ctest = True): }, ] -def unit_tests(image = OC_CI_CLIENT): - return [{ - "name": "ctest", - "image": image, - "environment": { - "LC_ALL": "C.UTF-8", - }, - "commands": [ - "cd %s" % dir["build"], - "useradd -m -s /bin/bash tester", - "chown -R tester:tester .", - "su-exec tester ctest --output-on-failure -LE nodrone", - ], - }] - def gui_tests(ctx, squish_parameters = "", server_type = "oc10"): record_video = False