Skip to content

Commit e1fc336

Browse files
committed
tests: attempt to use Neon source
1 parent db71faf commit e1fc336

5 files changed

Lines changed: 53 additions & 50 deletions

File tree

.github/workflows/pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: >-
2323
cmake -DCMAKE_BUILD_TYPE=Release -B ${{github.workspace}}/build
2424
--install-prefix ${{github.workspace}}/build/prefix
25-
-DBUILD_DOCS=ON
25+
-DBUILD_DOCS_ONLY=ON
2626
- name: Build documentation
2727
run: cmake --build ${{github.workspace}}/build --verbose --config Release --target docs
2828
- name: Upload artifact

.github/workflows/tests.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,19 @@ jobs:
66
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77
permissions:
88
contents: write
9-
runs-on: ${{ matrix.os }}
9+
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@v4
1212
with:
1313
fetch-depth: 0
1414
- name: Install dependencies
1515
run: |
1616
pipx install cpp-coveralls
17+
curl -s http://archive.neon.kde.org/public.key | gpg --dearmor | sudo tee /usr/share/keyrings/neon-archive-keyring.gpg > /dev/null
18+
echo "deb [signed-by=/usr/share/keyrings/neon-archive-keyring.gpg] http://archive.neon.kde.org/user noble main" | sudo tee /etc/apt/sources.list.d/neon.list > /dev/null
1719
sudo apt-get update
18-
sudo apt-get install -y kate extra-cmake-modules lcov
20+
sudo apt-get upgrade
21+
sudo apt-get install -y kf6-ktexteditor-dev extra-cmake-modules lcov
1922
- name: Configure
2023
run: >-
2124
cmake -DCMAKE_BUILD_TYPE=${{matrix.build-type}} -B ${{github.workspace}}/build
@@ -44,7 +47,6 @@ jobs:
4447
fail-fast: false
4548
matrix:
4649
build-type: [Debug, Release]
47-
os: [ubuntu-24.04, ubuntu-22.04]
4850
name: Tests
4951
'on':
5052
pull_request:

.vscode/dictionary.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ customwidgets
2020
datarootdir
2121
dbuild
2222
dcmake
23+
dearmor
2324
destinationlabel
2425
dialog
2526
docstrings

CMakeLists.txt

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,43 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
1919

2020
add_definitions(-DTRANSLATION_DOMAIN=\"katewakatime\")
2121
22-
option(BUILD_DOCS "Build documentation." OFF)
22+
option(BUILD_DOCS_ONLY "Build documentation only." OFF)
2323
option(BUILD_TESTS "Build tests." OFF)
2424
25-
if(BUILD_DOCS)
26-
find_package(Doxygen REQUIRED)
27-
set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
28-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${DOXYGEN_OUT} @ONLY)
29-
add_custom_target(
30-
docs
31-
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
32-
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
33-
install(
34-
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/html
35-
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION})
25+
find_package(Doxygen REQUIRED)
26+
set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
27+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${DOXYGEN_OUT} @ONLY)
28+
add_custom_target(
29+
docs
30+
COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
31+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
32+
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docs/html
33+
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION})
34+
35+
if(NOT BUILD_DOCS_ONLY)
36+
37+
find_package(ECM ${KF_DEP_VERSION} REQUIRED NO_MODULE)
38+
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
39+
40+
include(KDEInstallDirs6)
41+
include(KDECMakeSettings)
42+
include(ECMInstallIcons)
43+
include(KDECompilerSettings NO_POLICY_SCOPE)
44+
45+
# Sane flags from Kate project.
46+
add_definitions(
47+
-DQT_NO_CAST_FROM_ASCII
48+
-DQT_NO_CAST_FROM_BYTEARRAY
49+
-DQT_NO_CAST_TO_ASCII
50+
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
51+
-DQT_NO_URL_CAST_FROM_STRING
52+
-DQT_STRICT_ITERATORS
53+
-DQT_USE_FAST_OPERATOR_PLUS
54+
-DQT_USE_QSTRINGBUILDER
55+
-DVERSION=\"${CMAKE_PROJECT_VERSION}\")
56+
57+
# Needed to find the moc file.
58+
include_directories(${CMAKE_CURRENT_BINARY_DIR})
59+
60+
add_subdirectory(src)
3661
endif()
37-
38-
find_package(ECM ${KF_DEP_VERSION} REQUIRED NO_MODULE)
39-
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
40-
41-
include(KDEInstallDirs6)
42-
include(KDECMakeSettings)
43-
include(ECMInstallIcons)
44-
include(KDECompilerSettings NO_POLICY_SCOPE)
45-
46-
# Sane flags from Kate project.
47-
add_definitions(
48-
-DQT_NO_CAST_FROM_ASCII
49-
-DQT_NO_CAST_FROM_BYTEARRAY
50-
-DQT_NO_CAST_TO_ASCII
51-
-DQT_NO_SIGNALS_SLOTS_KEYWORDS
52-
-DQT_NO_URL_CAST_FROM_STRING
53-
-DQT_STRICT_ITERATORS
54-
-DQT_USE_FAST_OPERATOR_PLUS
55-
-DQT_USE_QSTRINGBUILDER
56-
-DVERSION=\"${CMAKE_PROJECT_VERSION}\")
57-
58-
# Needed to find the moc file.
59-
include_directories(${CMAKE_CURRENT_BINARY_DIR})
60-
61-
add_subdirectory(src)

src/CMakeLists.txt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ kcoreaddons_add_plugin(ktexteditor_wakatime INSTALL_NAMESPACE "kf6/ktexteditor"
88
target_link_libraries(ktexteditor_wakatime KF6::I18n KF6::TextEditor KF6::CoreAddons)
99

1010
set(WAKATIME_ICONS
11-
${CMAKE_CURRENT_SOURCE_DIR}/icons/512-apps-wakatime.png
12-
${CMAKE_CURRENT_SOURCE_DIR}/icons/16-apps-wakatime.png
13-
${CMAKE_CURRENT_SOURCE_DIR}/icons/22-apps-wakatime.png
14-
${CMAKE_CURRENT_SOURCE_DIR}/icons/sc-apps-wakatime.svg
15-
${CMAKE_CURRENT_SOURCE_DIR}/icons/128-apps-wakatime.png
16-
${CMAKE_CURRENT_SOURCE_DIR}/icons/256-apps-wakatime.png
17-
${CMAKE_CURRENT_SOURCE_DIR}/icons/32-apps-wakatime.png
18-
${CMAKE_CURRENT_SOURCE_DIR}/icons/48-apps-wakatime.png
19-
${CMAKE_CURRENT_SOURCE_DIR}/icons/64-apps-wakatime.png)
11+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/16-apps-wakatime.png
12+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/22-apps-wakatime.png
13+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/32-apps-wakatime.png
14+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/48-apps-wakatime.png
15+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/64-apps-wakatime.png
16+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/128-apps-wakatime.png
17+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/256-apps-wakatime.png
18+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/512-apps-wakatime.png
19+
${CMAKE_CURRENT_SOURCE_DIR}/../icons/sc-apps-wakatime.svg)
2020

2121
ecm_install_icons(ICONS ${WAKATIME_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
2222

0 commit comments

Comments
 (0)