CI: Add static/shared and python bindings

KDAB · Nov 13, 2023 · 929050b · 929050b
1 parent 9e852ac
commit 929050b
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,7 +4,15 @@
 
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+      - kdchart-3.0
+  pull_request:
+    branches:
+      - master
+      - kdchart-3.0
 
 jobs:
   build:
@@ -14,34 +22,60 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
-          - ubuntu-20.04
-          - windows-2022
-          - windows-2019
-          - macos-12
-          - macos-11
+          #- windows-2022
+          #- macos-12
+
         build_type:
-          - Debug
+          #- Debug
           - Release
-        qt:
-          - version: "5.15.2"
-            requested: "5.15"
-          - version: "6.3.2"  # Qt 6.3 is not an LTS version, so '6.3.*' always resolves to '6.3.2'
-            requested: "6.3.*"
+
+        link_type:
+          - shared
+          #- static
+
+        config:
+          - qt_version: "5.15"
+          - qt_version: "6.3.*"
+
+        include:
+          - os: ubuntu-22.04
+            build_type: Release
+            link_type: shared
+            config:
+              qt_version: "6.6.0"
+              apt_pgks:
+                - llvm
+              pip_pgks:
+                - shiboken6-generator==6.6.0 pyside6==6.6.0
 
     steps:
       - name: Install Qt with options and default aqtversion
         uses: jurplel/install-qt-action@v3
         with:
           aqtversion: null # use whatever the default is
-          modules: ${{ matrix.qt.modules }}
-          version: ${{ matrix.qt.requested }}
+          version: ${{ matrix.config.qt_version }}
           cache: true
 
       - name: Checkout sources
         uses: actions/checkout@v4
 
-      - name: Create build directory
-        run: mkdir build
+      - name: Install dependencies on Ubuntu (${{ join(matrix.config.apt_pgks, ' ') }})
+        if: ${{ runner.os == 'Linux' && matrix.config.apt_pgks }}
+        run: |
+          sudo apt update -qq
+          echo ${{ join(matrix.config.apt_pgks, ' ') }} | xargs sudo apt install -y
+
+      - name: Install Python dependencies (${{ join(matrix.config.pip_pgks, ' ') }})
+        if: ${{ matrix.config.pip_pgks }}
+        run: echo ${{ join(matrix.config.pip_pgks, ' ') }} | xargs pip install
+
+      - name: Hackery due Shiboken hardcoded paths
+        if: ${{ matrix.config.pip_pgks }}
+        run: |
+          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/bin/
+          sudo cp /usr/bin/g++-10 /opt/rh/gcc-toolset-10/root/usr/bin/c++
+          sudo mkdir -p /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
+          sudo cp /usr/lib/gcc/x86_64-linux-gnu/10/cc1plus /opt/rh/gcc-toolset-10/root/usr/lib/gcc/x86_64-linux-gnu/10/
 
       - name: Install ninja-build tool (must be after Qt due PATH changes)
         uses: turtlesec-no/get-ninja@main
@@ -52,11 +86,15 @@ jobs:
       - name: Configure project
         run: >
           cmake -S . -B ./build -G Ninja
+          --warn-uninitialized -Werror=dev
           -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -DKDChart_QT6=${{ startsWith(matrix.qt.version, '6.') }}
+          -DKDChart_QT6=${{ startsWith(matrix.config.qt_version, '6.') }}
+          -DKDChart_STATIC=${{ matrix.link_type == 'static' }}
           -DKDChart_TESTS=${{ matrix.build_type == 'Debug' }}
           -DKDChart_EXAMPLES=${{ matrix.build_type == 'Debug' }}
           -DKDChart_DOCS=${{ matrix.build_type == 'Debug' && runner.os == 'Linux' }}
+          -DKDChart_PYTHON_BINDINGS=${{ matrix.config.pip_pgks }}
+          -DPython3_FIND_VIRTUALENV=ONLY
 
       - name: Build Project
         run: cmake --build ./build

diff --git a/cmake/KDAB/modules/KDPySide6ModuleBuild.cmake b/cmake/KDAB/modules/KDPySide6ModuleBuild.cmake
@@ -114,8 +114,9 @@ macro(
         DIRECTORY
         PROPERTY INCLUDE_DIRECTORIES
     )
-    make_path(python_dir_include_dirs ${raw_python_dir_include_dirs})
-    set(shiboken_include_dirs "${shiboken_include_dirs}${PATH_SEP}${python_dir_include_dirs}")
+    # python_dir_include_dirs being empty breaks shiboken6 generator https://bugreports.qt.io/browse/PYSIDE-2505
+    #make_path(python_dir_include_dirs ${raw_python_dir_include_dirs})
+    #set(shiboken_include_dirs "${shiboken_include_dirs}${PATH_SEP}${python_dir_include_dirs}")
 
     set(shiboken_framework_include_dirs_option "")
     if(CMAKE_HOST_APPLE)

diff --git a/src/KDGantt/kdganttconstraint.cpp b/src/KDGantt/kdganttconstraint.cpp
@@ -64,7 +64,7 @@ Constraint::Constraint(const QModelIndex &idx1,
                        const QModelIndex &idx2,
                        Constraint::Type type,
                        Constraint::RelationType relationType,
-                       const Constraint::DataMap &datamap)
+                       const DataMap &datamap)
     : d(new Private)
 {
     d->start = idx1;

diff --git a/src/KDGantt/kdganttconstraint.h b/src/KDGantt/kdganttconstraint.h
@@ -23,6 +23,8 @@
 #endif
 
 namespace KDGantt {
+using DataMap = QMap<int, QVariant>;
+
 class KDGANTT_EXPORT Constraint
 {
     class Private;
@@ -47,8 +49,6 @@ class KDGANTT_EXPORT Constraint
         InvalidConstraintPen
     };
 
-    typedef QMap<int, QVariant> DataMap;
-
     Constraint();
     Constraint(const QModelIndex &idx1,
                const QModelIndex &idx2,