ci(build): generate wrappers first; then build without generator

jcfr · jcfr · commit f3a9b57fc572 · 2025-09-27T12:16:57.000-04:00
Split the pipeline in each job:
1) qmake build with CONFIG+=generator_only
2) run pythonqt_generator
3) qmake build with CONFIG+=exclude_generator and run tests
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,22 +56,43 @@ jobs:
       with:
          key: ${{ runner.os }}-ubuntu-${{ matrix.container_version }} 
          evict-old-files: 'job'
-         
-    - name: Build PythonQt
+
+    - name: Build PythonQt (generator_only)
+      run: |
+        export QT_SELECT=qt5
+        echo ======= SYSTEM INFO ========
+        uname -a; gcc --version | grep "gcc"; qmake --version
+        echo ============================
+        qmake -r PythonQt.pro CONFIG+=ccache CONFIG+=release CONFIG+=force_debug_info \
+        CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address \
+        CONFIG+=generator_only \
+        make -j $(nproc)
+
+    - name: Generate Wrappers
+      run: |
+        # workaround to allow to find the Qt include dirs for installed standard qt packages
+        mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
+        export QTDIR=/usr/include/qt5
+        cd generator
+        UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
+        ./pythonqt_generator
+
+    - name: Build PythonQt (exclude_generator)
       run: |
         export QT_SELECT=qt5
         echo ======= SYSTEM INFO ========
         uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
         echo ============================
         qmake -r PythonQt.pro CONFIG+=ccache CONFIG+=release CONFIG+=force_debug_info \
         CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address \
+        CONFIG+=exclude_generator \
         PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
         PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
         make -j $(nproc)
         PYTHONDEVMODE=1 PYTHONASYNCIODEBUG=1 PYTHONWARNINGS=error PYTHONMALLOC=malloc_debug \
         UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
           make check TESTARGS="-platform offscreen"
-        
+
     - name: Run memory tests with sanitizers
       run: |
         QT_VERSION_FULL=$(qmake -query QT_VERSION)
@@ -99,15 +120,6 @@ jobs:
         PYTHONQT_RUN_ONLY_CLEANUP_TESTS=1 \
         PYTHONQT_DISABLE_ASYNCIO=1 \
           make check TESTARGS="-platform minimal"
-      
-    - name: Generate Wrappers
-      run: |
-        # workaround to allow to find the Qt include dirs for installed standard qt packages
-        mkdir /usr/include/qt5; ln -s /usr/include/x86_64-linux-gnu/qt5 /usr/include/qt5/include
-        export QTDIR=/usr/include/qt5
-        cd generator
-        UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
-        ./pythonqt_generator
 
     - name: Upload Wrappers
       uses: actions/upload-artifact@v4
@@ -144,7 +156,25 @@ jobs:
     - name: Checkout PythonQt
       uses: actions/checkout@v5
 
-    - name: Build PythonQt
+    - name: Build PythonQt (generator_only)
+      run: |
+        export QT_SELECT=qt5
+        echo ======= SYSTEM INFO ========
+        uname -a; gcc --version | grep "gcc"; qmake-qt5 --version
+        echo ============================
+        qmake-qt5 -r PythonQt.pro CONFIG+=${{ matrix.configuration }} \
+          CONFIG+=generator_only
+        make -j $(nproc)
+
+    - name: Generate Wrappers
+      run: |
+        # workaround to allow to find the Qt include dirs for installed standard qt packages
+        mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
+        export QTDIR=/usr/include/qt5ln
+        cd generator
+        ./pythonqt_generator
+
+    - name: Build PythonQt (exclude_generator)
       run: |
         export QT_SELECT=qt5
         echo ======= SYSTEM INFO ========
@@ -157,19 +187,12 @@ jobs:
         echo PYTHON_VERSION_SHORT=${PYTHON_VERSION_SHORT}
         echo PYTHON_DIR=${PYTHON_DIR}
         qmake-qt5 -r PythonQt.pro CONFIG+=${{ matrix.configuration }} \
+          CONFIG+=exclude_generator \
           "PYTHON_VERSION=${PYTHON_VERSION_SHORT}" "PYTHON_DIR=${PYTHON_DIR}"
         make -j $(nproc) && \
         PYTHONDEVMODE=1 PYTHONASYNCIODEBUG=1 PYTHONWARNINGS=error PYTHONMALLOC=malloc_debug \
           make check TESTARGS="-platform offscreen"
 
-    - name: Generate Wrappers
-      run: |
-        # workaround to allow to find the Qt include dirs for installed standard qt packages
-        mkdir /usr/include/qt5ln; ln -s /usr/include/qt5 /usr/include/qt5ln/include
-        export QTDIR=/usr/include/qt5ln
-        cd generator
-        ./pythonqt_generator
-
     - name: Upload Wrappers
       uses: actions/upload-artifact@v4
       with:
@@ -235,7 +258,25 @@ jobs:
         echo "MACOS_VERSION_FULL=$MACOS_VERSION_FULL" | tee -a $GITHUB_OUTPUT
         echo "MACOS_VERSION_SHORT=$MACOS_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
 
-    - name: Build PythonQt
+    - name: Build PythonQt (generator_only)
+      run: |
+        set -ue
+        echo ======= SYSTEM INFO ========
+        uname -a; gcc --version | head -n 1; qmake --version
+        echo ============================
+        qmake CONFIG+=ccache CONFIG+=${{ matrix.configuration }} CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address \
+          CONFIG+=generator_only \
+          -r PythonQt.pro
+        make -j $(nproc)
+
+    - name: Generate Wrappers
+      if: ${{ contains(matrix.configuration, 'release') }}
+      run: |
+        cd generator
+        UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
+        ./pythonqt_generator
+
+    - name: Build PythonQt (exclude_generator)
       run: |
         set -ue
         echo ======= SYSTEM INFO ========
@@ -246,6 +287,7 @@ jobs:
                  "python${PYTHON_VERSION_MAJOR}-embed" "python${PYTHON_VERSION_MAJOR}"
         do if pkg-config --exists "$i"; then PYTHON_PKGCONFIG_NAME="$i"; break; fi; done
         qmake CONFIG+=ccache CONFIG+=${{ matrix.configuration }} CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address \
+          CONFIG+=exclude_generator \
           PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }} \
           PYTHON_DIR="$pythonLocation" \
           PKGCONFIG+=$PYTHON_PKGCONFIG_NAME \
@@ -255,13 +297,6 @@ jobs:
         UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
           make check TESTARGS="-platform offscreen"
 
-    - name: Generate Wrappers
-      if: ${{ contains(matrix.configuration, 'release') }}
-      run: |
-        cd generator
-        UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
-        ./pythonqt_generator
-
     - name: Upload Wrappers
       if: ${{ contains(matrix.configuration, 'release') }}
       uses: actions/upload-artifact@v4
@@ -351,13 +386,31 @@ jobs:
         echo "QT_VERSION_SHORT=$QT_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
         echo "PYTHON_VERSION_SHORT=$PYTHON_VERSION_SHORT" | tee -a $GITHUB_OUTPUT
 
-    - name: Build PythonQt
+    - name: Build PythonQt (generator_only)
+      shell: cmd
+      run: |
+        qmake -query
+        qmake CONFIG+=release CONFIG-=debug_and_release CONFIG-=debug_and_release_target ^
+           CONFIG+=generator_only ^
+           PythonQt.pro
+        mingw32-make -j 2 ^
+          || set CL=/MP && nmake
+
+    - name: Generate Wrappers
+      shell: cmd
+      run: |
+        cd generator
+        set QTDIR=%QT_ROOT_DIR%
+        pythonqt_generator
+
+    - name: Build PythonQt (exclude_generator)
       shell: cmd
       run: |
         qmake -query
         python --version
         set PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }}
         qmake CONFIG+=release CONFIG-=debug_and_release CONFIG-=debug_and_release_target ^
+           CONFIG+=exclude_generator ^
            "PYTHON_PATH=%pythonLocation%" ^
            "PYTHON_VERSION=${{ steps.versions.outputs.PYTHON_VERSION_SHORT }}" ^
            PythonQt.pro
@@ -367,13 +420,6 @@ jobs:
         mingw32-make -j 2 && mingw32-make check "TESTARGS=-platform offscreen" ^
           || set CL=/MP && nmake && nmake check "TESTARGS=-platform offscreen"
 
-    - name: Generate Wrappers
-      shell: cmd
-      run: |
-        cd generator
-        set QTDIR=%QT_ROOT_DIR%
-        pythonqt_generator
-
     - name: Upload Wrappers
       if: (matrix.pythonqtall-config || '') == ''
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml
@@ -98,28 +98,30 @@ jobs:
         path: generated_cpp
         if-no-files-found: error
 
-    - name: Build PythonQt Ubuntu
+    - name: Build PythonQt Ubuntu (exclude_generator)
       if: ${{ matrix.os == 'ubuntu' }}
       run: |
         echo ======= SYSTEM INFO ========
         uname -a; gcc --version | grep "gcc"; python3 --version; qmake --version
         echo ============================
         qmake -r PythonQt.pro CONFIG+=ccache CONFIG+=release CONFIG+=force_debug_info \
         CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address \
+        CONFIG+=exclude_generator \
         PYTHON_VERSION=$(python3 --version | cut -d " " -f 2 | cut -d "." -f1,2) \
         PYTHON_DIR=$(which python3 | xargs dirname | xargs dirname)
         make -j $(nproc)
         PYTHONDEVMODE=1 PYTHONASYNCIODEBUG=1 PYTHONWARNINGS=error PYTHONMALLOC=malloc_debug \
         UBSAN_OPTIONS="halt_on_error=1" ASAN_OPTIONS="detect_leaks=0:detect_stack_use_after_return=1:fast_unwind_on_malloc=0" \
           make check TESTARGS="-platform offscreen"
           
-    - name: Build PythonQt Windows
+    - name: Build PythonQt Windows (exclude_generator)
       shell: cmd
       if: ${{ matrix.os == 'windows' }}
       run: |
         qmake -query
         python --version
         qmake CONFIG+=release CONFIG-=debug_and_release CONFIG-=debug_and_release_target ^
+           CONFIG+=exclude_generator ^
            "PYTHONQTALL_CONFIG=${{ matrix.pythonqtall-config }}" ^
            "PYTHON_PATH=%pythonLocation%" ^
            "PYTHON_VERSION=${{ steps.setenv.outputs.PYTHON_VERSION_SHORT }}" ^
