remove workflow and CI related files

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
2025-02-23 10:22:55 +00:00 · 2022-09-24 04:28:48 +03:00 · 2022-09-24 04:28:48 +03:00 · a98bd715fc
commit a98bd715fc
parent 4cbcf5d16c
24 changed files with 53 additions and 212 deletions
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@ -1,57 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 7 * * 3'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
-        language: ['cpp', 'javascript', 'python']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get install -qq libdeflate-dev libjansson-dev libc6-dev libpng-dev libcups2-dev libfreetype6-dev libfontconfig1-dev libdbus-1-dev libicu-dev xorg-dev
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -102,7 +102,7 @@ if(NOT KATIE_UNIFDEF)
    message(WARNING "Could not find unifdef, headers will not be optimized")
 endif()

-# used as shebang for profile, exec, dbus, xvfb and dbg scripts
+# used as shebang for profile, exec and dbg scripts
 find_program(KATIE_SHELL NAMES sh dash mksh ksh ash)
 if(NOT KATIE_SHELL)
    message(FATAL_ERROR "Could not detect shell, supported are: sh, dash, mksh, ksh and ash")
@ -377,7 +377,7 @@ if(KATIE_TESTS OR KATIE_BENCHMARKS)
    add_definitions(-DQT_BUILD_INTERNAL)
 endif()

-foreach(script exec dbus xvfb dbg)
+foreach(script exec dbg)
    configure_file(
        ${CMAKE_SOURCE_DIR}/cmake/${script}.sh.cmake
        ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/${script}.sh
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,36 +0,0 @@
-version: 4.12.0-{branch}-{build}
-image: Ubuntu2004
-clone_depth: 1
-cache:
-  - /home/appveyor/.ccache
-
-build_script:
- sh: >-
-    git log > /tmp/gitlog.txt
-
-    grep -q '\[ci reset\]' /tmp/gitlog.txt && rm -rf /home/appveyor/.ccache
-
-    sudo apt-get update -qq
-
-    sudo apt-get install -qq libdeflate-dev libc6-dev \
-        libpng-dev libcups2-dev libfreetype6-dev libfontconfig1-dev \
-        libdbus-1-dev libicu-dev xorg-dev dbus-x11 libjansson-dev ccache \
-        fonts-freefont-ttf
-
-    export PATH="/usr/lib/ccache/:$PATH"
-
-    python ./scripts/cicount.py
-
-    cmake . -Wno-dev -DKATIE_TESTS=ON -DKATIE_BENCHMARKS=ON -DKATIE_UTILS=ON
-
-    make -j $(nproc || echo 1)
-
-test_script:
- sh: >-
-    Xvfb :123 &
-
-    export DISPLAY=:123
-
-    cd tests/auto
-
-    ctest -V
--- a/cmake/dbus.sh.cmake
+++ b/cmake/dbus.sh.cmake
@ -1,20 +0,0 @@
-#!@KATIE_SHELL@
-
-set -e
-
-if [ -z "$LD_LIBRARY_PATH" ];then
-    export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib"
-else
-    export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
-fi
-export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
-export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
-
-bin="$1"
-shift
-
-cd "$(dirname "$bin")"
-if [ -z "$DBUS_SESSION_BUS_ADDRESS" ];then
-    exec dbus-run-session -- @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@"
-fi
-exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@"
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@ -342,29 +342,6 @@ macro(KATIE_TEST TESTNAME TESTSOURCES)
    )
 endmacro()

-# a macro to add D-Bus tests easily by setting them up with the assumptions they make
-macro(KATIE_DBUS_TEST TESTNAME TESTSOURCES)
-    katie_setup_target(${TESTNAME} ${TESTSOURCES} ${ARGN})
-
-    add_executable(${TESTNAME} ${${TESTNAME}_SOURCES})
-    add_dependencies(${TESTNAME} plugins_dependant_tests)
-
-    target_link_libraries(${TESTNAME} KtCore KtDBus KtTest)
-    target_compile_definitions(
-        ${TESTNAME} PRIVATE
-        -DSRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/"
-    )
-    set_target_properties(
-        ${TESTNAME} PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-    )
-
-    add_test(
-        NAME ${TESTNAME}
-        COMMAND "${CMAKE_BINARY_DIR}/dbus.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}"
-    )
-endmacro()
-
 # a macro to add tests that require GUI easily by setting them up with the assumptions they make
 macro(KATIE_GUI_TEST TESTNAME TESTSOURCES)
    katie_setup_target(${TESTNAME} ${TESTSOURCES} ${ARGN})
@ -385,6 +362,6 @@ macro(KATIE_GUI_TEST TESTNAME TESTSOURCES)

    add_test(
        NAME ${TESTNAME}
-        COMMAND "${CMAKE_BINARY_DIR}/xvfb.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}"
+        COMMAND "${CMAKE_BINARY_DIR}/exec.sh" "${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME}"
    )
 endmacro()
--- a/cmake/xvfb.sh.cmake
+++ b/cmake/xvfb.sh.cmake
@ -1,28 +0,0 @@
-#!@KATIE_SHELL@
-
-set -e
-
-if [ -z "$LD_LIBRARY_PATH" ];then
-    export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib"
-else
-    export LD_LIBRARY_PATH="@CMAKE_BINARY_DIR@/lib:$LD_LIBRARY_PATH"
-fi
-export QT_PLUGIN_PATH="@CMAKE_BINARY_DIR@/plugins"
-export QML_IMPORT_PATH="@CMAKE_BINARY_DIR@/imports"
-
-bin="$1"
-shift
-
-cd "$(dirname "$bin")"
-if [ -z "$DISPLAY" ];then
-    Xvfb :123 &
-    xvfbpid=$!
-    sleep 5
-
-    retval=0
-    DISPLAY=:123 @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@" || retval=$?
-
-    kill $xvfbpid
-    exit $retval
-fi
-exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" "$@"
--- a/scripts/cicount.py
+++ b/scripts/cicount.py
@ -1,24 +0,0 @@
-#!/usr/bin/python
-
-import os, sys
-
-cicountdir = "/home/appveyor/.ccache"
-cicountfile = cicountdir + "/cicount"
-
-cicount = 0
-try:
-    with open(cicountfile, 'r') as f:
-        cicontent = f.read()
-        cicount = int(cicontent)
-except:
-    cicount = 10
-
-if cicount >= 10:
-    import randconfig
-    cicount = 0
-
-if not os.path.isdir(cicountdir):
-    os.makedirs(cicountdir)
-cicount += 1
-with open(cicountfile, 'w') as f:
-    f.write(str(cicount))
--- a/tests/auto/qdbusabstractadaptor/CMakeLists.txt
+++ b/tests/auto/qdbusabstractadaptor/CMakeLists.txt
@ -1,9 +1,11 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusabstractadaptor
+    katie_test(tst_qdbusabstractadaptor
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusabstractadaptor.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
    )

+    target_link_libraries(tst_qdbusabstractadaptor KtDBus)
+
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    katie_setup_target(qdbusabstractadaptor_qmyserver
        ${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
--- a/tests/auto/qdbusabstractinterface/CMakeLists.txt
+++ b/tests/auto/qdbusabstractinterface/CMakeLists.txt
@ -1,5 +1,5 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusabstractinterface
+    katie_test(tst_qdbusabstractinterface
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusabstractinterface.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/interface.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/interface.h
@ -7,6 +7,8 @@ if(WITH_DBUS AND DBUS_FOUND)
        ${CMAKE_CURRENT_SOURCE_DIR}/pinger.h
    )

+    target_link_libraries(tst_qdbusabstractinterface KtDBus)
+
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    katie_setup_target(qdbusabstractinterface_qpinger
        ${CMAKE_CURRENT_SOURCE_DIR}/qpinger/qpinger.cpp
--- a/tests/auto/qdbusconnection/CMakeLists.txt
+++ b/tests/auto/qdbusconnection/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusconnection
+    katie_test(tst_qdbusconnection
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusconnection.cpp
    )
+
+    target_link_libraries(tst_qdbusconnection KtDBus)
 endif()
--- a/tests/auto/qdbuscontext/CMakeLists.txt
+++ b/tests/auto/qdbuscontext/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbuscontext
+    katie_test(tst_qdbuscontext
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuscontext.cpp
    )
+
+    target_link_libraries(tst_qdbuscontext KtDBus)
 endif()
--- a/tests/auto/qdbusinterface/CMakeLists.txt
+++ b/tests/auto/qdbusinterface/CMakeLists.txt
@ -1,9 +1,11 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusinterface
+    katie_test(tst_qdbusinterface
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusinterface.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/myobject.h
    )

+    target_link_libraries(tst_qdbusinterface KtDBus)
+
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    katie_setup_target(qdbusinterface_qmyserver
        ${CMAKE_CURRENT_SOURCE_DIR}/qmyserver/qmyserver.cpp
--- a/tests/auto/qdbuslocalcalls/CMakeLists.txt
+++ b/tests/auto/qdbuslocalcalls/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbuslocalcalls
+    katie_test(tst_qdbuslocalcalls
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuslocalcalls.cpp
    )
+
+    target_link_libraries(tst_qdbuslocalcalls KtDBus)
 endif()
--- a/tests/auto/qdbusmarshall/CMakeLists.txt
+++ b/tests/auto/qdbusmarshall/CMakeLists.txt
@ -1,12 +1,12 @@
 if(WITH_DBUS AND DBUS_FOUND)
    include_directories(${DBUS_INCLUDES})

-    katie_dbus_test(tst_qdbusmarshall
+    katie_test(tst_qdbusmarshall
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmarshall.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/common.h
    )

-    target_link_libraries(tst_qdbusmarshall ${DBUS_LIBRARIES})
+    target_link_libraries(tst_qdbusmarshall KtDBus ${DBUS_LIBRARIES})

    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    katie_setup_target(qdbusmarshall_qpong
--- a/tests/auto/qdbusmetaobject/CMakeLists.txt
+++ b/tests/auto/qdbusmetaobject/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusmetaobject
+    katie_test(tst_qdbusmetaobject
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetaobject.cpp
    )
+
+    target_link_libraries(tst_qdbusmetaobject KtDBus)
 endif()
--- a/tests/auto/qdbusmetatype/CMakeLists.txt
+++ b/tests/auto/qdbusmetatype/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusmetatype
+    katie_test(tst_qdbusmetatype
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusmetatype.cpp
    )
+
+    target_link_libraries(tst_qdbusmetatype KtDBus)
 endif()
--- a/tests/auto/qdbuspendingcall/CMakeLists.txt
+++ b/tests/auto/qdbuspendingcall/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbuspendingcall
+    katie_test(tst_qdbuspendingcall
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbuspendingcall.cpp
    )
+
+    target_link_libraries(tst_qdbuspendingcall KtDBus)
 endif()
--- a/tests/auto/qdbusreply/CMakeLists.txt
+++ b/tests/auto/qdbusreply/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusreply
+    katie_test(tst_qdbusreply
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusreply.cpp
    )
+
+    target_link_libraries(tst_qdbusreply KtDBus)
 endif()
--- a/tests/auto/qdbusservicewatcher/CMakeLists.txt
+++ b/tests/auto/qdbusservicewatcher/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusservicewatcher
+    katie_test(tst_qdbusservicewatcher
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusservicewatcher.cpp
    )
+
+    target_link_libraries(tst_qdbusservicewatcher KtDBus)
 endif()
--- a/tests/auto/qdbusthreading/CMakeLists.txt
+++ b/tests/auto/qdbusthreading/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusthreading
+    katie_test(tst_qdbusthreading
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusthreading.cpp
    )
+
+    target_link_libraries(tst_qdbusthreading KtDBus)
 endif()
--- a/tests/auto/qdbustype/CMakeLists.txt
+++ b/tests/auto/qdbustype/CMakeLists.txt
@ -1,9 +1,9 @@
 if(WITH_DBUS AND DBUS_FOUND)
    include_directories(${DBUS_INCLUDES})

-    katie_dbus_test(tst_qdbustype
+    katie_test(tst_qdbustype
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbustype.cpp
    )

-    target_link_libraries(tst_qdbustype ${DBUS_LIBRARIES})
+    target_link_libraries(tst_qdbustype KtDBus ${DBUS_LIBRARIES})
 endif()
--- a/tests/auto/qdbusxmlparser/CMakeLists.txt
+++ b/tests/auto/qdbusxmlparser/CMakeLists.txt
@ -1,5 +1,7 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusxmlparser
+    katie_test(tst_qdbusxmlparser
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusxmlparser.cpp
    )
+
+    target_link_libraries(tst_qdbusxmlparser KtDBus)
 endif()
--- a/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt
+++ b/tests/benchmarks/dbus/qdbusperformance/CMakeLists.txt
@ -1,9 +1,11 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_qdbusperformance
+    katie_test(tst_qdbusperformance
        ${CMAKE_CURRENT_SOURCE_DIR}/tst_qdbusperformance.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/serverobject.h
    )

+    target_link_libraries(tst_qdbusperformance KtDBus)
+
    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
    katie_setup_target(performance_server
        ${CMAKE_CURRENT_SOURCE_DIR}/server/server.cpp
--- a/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
+++ b/tests/benchmarks/dbus/qdbustype/CMakeLists.txt
@ -1,8 +1,9 @@
 if(WITH_DBUS AND DBUS_FOUND)
-    katie_dbus_test(tst_bench_qdbustype
+    include_directories(${DBUS_INCLUDES})
+
+    katie_test(tst_bench_qdbustype
        ${CMAKE_CURRENT_SOURCE_DIR}/main.cpp
    )

-    target_link_libraries(tst_bench_qdbustype ${DBUS_LIBRARIES})
-    include_directories(${DBUS_INCLUDES})
+    target_link_libraries(tst_bench_qdbustype KtDBus ${DBUS_LIBRARIES})
 endif()