Page Menu
Home
Phorge
Search
Configure Global Search
Log In
Files
F16121692
D257.1766006981.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D257.1766006981.diff
View Options
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,35 +2,9 @@
# SPDX-FileCopyrightText: 2022-2023 tusooa <tusooa@kazv.moe>
# SPDX-License-Identifier: AGPL-3.0-or-later
-workflow:
- rules:
- - if: '$CI_PIPELINE_SOURCE == "trigger"'
- - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
- when: never
- - if: $CI_COMMIT_BRANCH
- - if: '$CI_COMMIT_TAG !~ /^phabricator\//'
-
stages:
- - prepare
- build
- lint
- - report
-
-.report:
- image:
- name: 'reg.lily.kazv.moe/infra/phorge-ci-tools:servant'
- rules:
- - if: $TARGET_PHID
- when: always
- - when: never
- before_script:
- - pipelineUrl="$CI_PROJECT_URL"/-/pipelines/"$CI_PIPELINE_ID"
-
-report-start:
- extends: .report
- stage: prepare
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"work\", \"unit\": [{\"name\": \"GitLab CI (information only)\", \"result\": \"skip\", \"details\": \"$pipelineUrl\", \"format\": \"remarkup\"}]}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
'lint':
stage: lint
@@ -126,36 +100,10 @@
'build:GNU/Linux-amd64-debug:kf6':
extends: .build-debug
- before_script:
- - !reference [.build-debug, before_script]
- - export KF_VER=6
image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu22.04-debug'
+ name: 'r.lily-is.land/the-kazv-project/libkazv:servant-ubuntu24.04-debug'
'build:GNU/Linux-amd64-prod:kf6':
extends: .build-prod
- before_script:
- - !reference [.build-prod, before_script]
- - export KF_VER=6
image:
- name: 'reg.lily.kazv.moe/kazv/libkazv/libkazv:servant-ubuntu22.04-prod'
-
-report-success:
- extends: .report
- rules:
- - if: $TARGET_PHID
- when: on_success
- - when: never
- stage: report
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"pass\"}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
-
-report-failure:
- extends: .report
- rules:
- - if: $TARGET_PHID
- when: on_failure
- - when: never
- stage: report
- script:
- - 'echo "{\"receiver\": \"$TARGET_PHID\", \"type\": \"fail\"}" | /tools/arcanist/bin/arc call-conduit --conduit-uri https://iron.lily-is.land/ --conduit-token "$CONDUIT_TOKEN" -- harbormaster.sendmessage'
+ name: 'r.lily-is.land/the-kazv-project/libkazv:servant-ubuntu24.04-prod'
diff --git a/packaging/GNU-Linux/appimage/build.sh b/packaging/GNU-Linux/appimage/build.sh
--- a/packaging/GNU-Linux/appimage/build.sh
+++ b/packaging/GNU-Linux/appimage/build.sh
@@ -55,7 +55,7 @@
qt6-websockets-dev
)
export QMAKE=qmake6
- cp -v packaging/GNU-Linux/appimage/kde-neon-jammy.list /etc/apt/sources.list.d/
+ cp -v packaging/GNU-Linux/appimage/kde-neon-noble.list /etc/apt/sources.list.d/
fi
apt-get update && \
@@ -81,6 +81,7 @@
mkdir -pv /run/user/test
chown builder:builder /run/user/test
+chmod 700 /run/user/test
su builder -c "env PATH='$PATH' '$thisDir'/build-unprivileged.sh" || exit 1
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
diff --git a/packaging/GNU-Linux/appimage/kde-neon-focal.list b/packaging/GNU-Linux/appimage/kde-neon-focal.list
deleted file mode 100644
--- a/packaging/GNU-Linux/appimage/kde-neon-focal.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://archive.neon.kde.org/release focal main
diff --git a/packaging/GNU-Linux/appimage/kde-neon-jammy.list b/packaging/GNU-Linux/appimage/kde-neon-jammy.list
deleted file mode 100644
--- a/packaging/GNU-Linux/appimage/kde-neon-jammy.list
+++ /dev/null
@@ -1 +0,0 @@
-deb http://archive.neon.kde.org/release jammy main
diff --git a/packaging/GNU-Linux/appimage/kde-neon-noble.list b/packaging/GNU-Linux/appimage/kde-neon-noble.list
new file mode 100644
--- /dev/null
+++ b/packaging/GNU-Linux/appimage/kde-neon-noble.list
@@ -0,0 +1 @@
+deb http://archive.neon.kde.org/release noble main
diff --git a/packaging/GNU-Linux/appimage/test.sh b/packaging/GNU-Linux/appimage/test.sh
--- a/packaging/GNU-Linux/appimage/test.sh
+++ b/packaging/GNU-Linux/appimage/test.sh
@@ -4,17 +4,19 @@
set -x
-weston --backend=headless-backend.so --idle-time=0 &
+echo "XDG_RUNTIME_DIR=$XDG_RUNTIME_DIR"
+
+weston -S wayland-test --backend=headless-backend.so --idle-time=0 &
sleep 5
-QT_QPA_PLATFORM=wayland make test
+ls /run/user/test
+socket=/run/user/test/wayland-test
+echo "Wayland socket is $socket"
+CTEST_OUTPUT_ON_FAILURE=ON QT_QPA_PLATFORM=wayland WAYLAND_DISPLAY="$socket" make test
ret=$?
echo "Tests returned $ret"
-echo
-
-cat Testing/Temporary/LastTest.log
kill %1
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -46,11 +46,9 @@
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::HttpServer kazvtestlib
)
-ecm_add_test(
- quick-test.cpp
- TEST_NAME quicktest
- LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::QuickTest kazvtestlib
-)
+add_executable(quicktest quick-test.cpp)
+
+target_link_libraries(quicktest PRIVATE Qt${QT_MAJOR_VERSION}::QuickTest kazvtestlib)
if(KAZV_BUILD_BENCHMARKS)
ecm_add_test(
@@ -58,4 +56,53 @@
LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test kazvtestlib
)
endif()
-set_tests_properties(quicktest PROPERTIES WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+set(quicktest_QMLS
+ tst_About.qml
+ tst_AddStickerPopup.qml
+ tst_AvatarImageAdapters.qml
+ tst_ConfirmUploadPopup.qml
+ tst_CreateRoomPage.qml
+ tst_DeviceList.qml
+ tst_DevicePopup.qml
+ tst_Device.qml
+ tst_EventHistoryView.qml
+ tst_EventReactions.qml
+ tst_EventReadIndicator.qml
+ tst_EventSourceView.qml
+ tst_EventView.qml
+ tst_EventViewRedacted.qml
+ tst_EventViewVideo.qml
+ tst_FileHandler.qml
+ tst_JoinRoomPage.qml
+ tst_KazvIOMenu.qml
+ tst_kazvshortcutsActionItem.qml
+ tst_LoginPage.qml
+ tst_MatrixHelpers.qml
+ tst_Notifications.qml
+ tst_PageManager.qml
+ tst_ReactToEventPopup.qml
+ tst_RoomInvitePage.qml
+ tst_RoomListViewItemDelegate.qml
+ tst_RoomMemberListPage.qml
+ tst_RoomNameProvider.qml
+ tst_RoomPage.qml
+ tst_RoomPinnedEventsPage.qml
+ tst_RoomSettingsPage.qml
+ tst_RoomStatePage.qml
+ tst_RoomStickerPackItemDelegate.qml
+ tst_RoomStickerPacksPage.qml
+ tst_RoomTimelineView.qml
+ tst_SendMessageBoxDrafts.qml
+ tst_SendMessageBox.qml
+ tst_StickerPackNameProvider.qml
+ tst_StickerPicker.qml
+ tst_TypingIndicator.qml
+ tst_UserNameProvider.qml
+ tst_UserPage.qml
+)
+foreach(testfilename ${quicktest_QMLS})
+ message(STATUS "Adding quick test ${testfilename}")
+ string(REPLACE .qml "" testname ${testfilename})
+ add_test(NAME ${testname} COMMAND quicktest -input ${CMAKE_CURRENT_SOURCE_DIR}/quick-tests/${testfilename})
+endforeach()
diff --git a/src/tests/quick-tests/tst_RoomInvitePage.qml b/src/tests/quick-tests/tst_RoomInvitePage.qml
--- a/src/tests/quick-tests/tst_RoomInvitePage.qml
+++ b/src/tests/quick-tests/tst_RoomInvitePage.qml
@@ -22,6 +22,7 @@
RoomSettings.RoomInvitePage {
id: roomInvitePage
+ anchors.fill: parent
room: item.room
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Dec 17, 1:29 PM (16 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
794722
Default Alt Text
D257.1766006981.diff (7 KB)
Attached To
Mode
D257: Use lilybuild
Attached
Detach File
Event Timeline
Log In to Comment