Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: require minimum Qt6.7 #12003

Merged
merged 3 commits into from
Dec 9, 2024
Merged

feat: require minimum Qt6.7 #12003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0d328e
feat: require minimum Qt6.7
DeepDiver1975 Dec 6, 2024
e7b0805
chore: bump squish image
saw-jan Dec 9, 2024
0b5f272
ci: drop unit test pipeline from drone
DeepDiver1975 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 3 additions & 36 deletions .drone.star
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ 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_SQUISH = "owncloudci/squish:fedora-39-7.2.1-qt66x-linux64"
OC_CI_CLIENT_FEDORA = "owncloudci/client:fedora-41-amd64"
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"
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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():
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
saw-jan marked this conversation as resolved.
Show resolved Hide resolved

find_package(Qt6 COMPONENTS Core Concurrent Network Widgets Xml Quick QuickWidgets QuickControls2 REQUIRED)
find_package(Qt6LinguistTools REQUIRED)
Expand Down
Loading