[neon/snap-packaging/kde-qt5-core-sdk] /: Disable failing qtdoc.`

Scarlett Moore null at kde.org
Thu Oct 10 07:43:43 BST 2024


Git commit 90873e1bfb156b878d789559837cdc2427bc72ba by Scarlett Moore.
Committed on 10/10/2024 at 06:43.
Pushed by scarlettmoore into branch 'master'.

Disable failing qtdoc.`

M  +34   -34   snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt5-core-sdk/-/commit/90873e1bfb156b878d789559837cdc2427bc72ba

diff --git a/snapcraft.yaml b/snapcraft.yaml
index d0b2654..a50a703 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -543,39 +543,39 @@ parts:
     prime:
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
       - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
-  qtdoc:
-    after:
-    - qtdeclarative
-    - qtxmlpatterns
-    - qtbase
-    - qtdeclarative
-    - qtmultimedia
-    - qttools
-    - qtwebengine
-    source: https://invent.kde.org/qt/qt/qtdoc.git
-    source-branch: kde/5.15
-    plugin: nil
-    build-environment:
-        - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-        - PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
-        - QT_INSTALL_DOCS: $CRAFT_PART_INSTALL/usr/share/qt5/doc
-    override-build: |
-      # $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
-      #$CRAFT_STAGE/usr/lib/qt5/bin/qmake -query
-      $CRAFT_STAGE/usr/lib/qt5/bin/qmake
-      make -j$CRAFT_PARALLEL_BUILD_COUNT docs
-      # make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
-      # cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
-    override-stage: |
-      craftctl default
-      # Cleanup space on build VM to prevent running out of disk space for later parts
-      rm -rf $CRAFT_STAGE/../parts/qtdoc/build/*
-      rm -rf $CRAFT_STAGE/../parts/qtdoc/src/*
-      rm -rf $CRAFT_STAGE/../parts/qtdoc/build/.git
-      rm -rf $CRAFT_STAGE/../parts/qtdoc/src/.git
-    prime:
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
-      - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
+  # qtdoc:
+  #   after:
+  #   - qtdeclarative
+  #   - qtxmlpatterns
+  #   - qtbase
+  #   - qtdeclarative
+  #   - qtmultimedia
+  #   - qttools
+  #   - qtwebengine
+  #   source: https://invent.kde.org/qt/qt/qtdoc.git
+  #   source-branch: kde/5.15
+  #   plugin: nil
+  #   build-environment:
+  #       - LD_LIBRARY_PATH: $CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+  #       - PATH: $CRAFT_STAGE/usr/bin${PATH:+:$PATH}
+  #       - QT_INSTALL_DOCS: $CRAFT_PART_INSTALL/usr/share/qt5/doc
+  #   override-build: |
+  #     # $CRAFT_STAGE/usr/lib/qt5/bin/qmake -qtconf "$CRAFT_STAGE/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/qt5/qt.conf"
+  #     #$CRAFT_STAGE/usr/lib/qt5/bin/qmake -query
+  #     $CRAFT_STAGE/usr/lib/qt5/bin/qmake
+  #     make -j$CRAFT_PARALLEL_BUILD_COUNT docs
+  #     # make INSTALL_ROOT="$CRAFT_PART_INSTALL/tmp" install
+  #     # cp -a "$CRAFT_PART_INSTALL/tmp$CRAFT_STAGE/." "$CRAFT_PART_INSTALL"
+  #   override-stage: |
+  #     craftctl default
+  #     # Cleanup space on build VM to prevent running out of disk space for later parts
+  #     rm -rf $CRAFT_STAGE/../parts/qtdoc/build/*
+  #     rm -rf $CRAFT_STAGE/../parts/qtdoc/src/*
+  #     rm -rf $CRAFT_STAGE/../parts/qtdoc/build/.git
+  #     rm -rf $CRAFT_STAGE/../parts/qtdoc/src/.git
+  #   prime:
+  #     - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.la
+  #     - -./usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/*.prl
   qtlottie:
     after: [ qtdeclarative ]
     source: https://invent.kde.org/qt/qt/qtlottie.git
@@ -1146,7 +1146,7 @@ parts:
     #     done
 
   conditioning:
-    after: [ qtimageformats, qtgamepad, qtgraphicaleffects, qtscript, qtspeech, qtwebsockets, qtwebglplugin, qtx11extras, qtcharts, qtconnectivity, qtdatavis3d, qttools, qtdoc, qtquick3d, qtlottie, qtnetworkauth, qtserialport, qtquicktimeline, qtremoteobjects, qtscxml, qtsensors, qtserialbus, qttranslations, qtmultimedia, qt3d, qtwayland, qtwebengine ]
+    after: [ qtimageformats, qtgamepad, qtgraphicaleffects, qtscript, qtspeech, qtwebsockets, qtwebglplugin, qtx11extras, qtcharts, qtconnectivity, qtdatavis3d, qttools, qtquick3d, qtlottie, qtnetworkauth, qtserialport, qtquicktimeline, qtremoteobjects, qtscxml, qtsensors, qtserialbus, qttranslations, qtmultimedia, qt3d, qtwayland, qtwebengine ]
     plugin: nil
     override-prime: |
       set -eux


More information about the Neon-commits mailing list