Use system QScintilla and QuaZIP for Ubuntu native builds (#1884)

* Use system QScintilla * Use system QuaZIP * Add a very dirty fix (with unexpected behavior when using CONFIG-=) to eliminate attempts to use non-system QuaZIP or QScinitilla when using the corresponding use_system options._* --------- Co-authored-by: iakov <[email protected]>
trikset · Jan 10, 2025 · 8c56cf9 · 8c56cf9
1 parent b86d55e
commit 8c56cf9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/common_build.yml b/.github/workflows/common_build.yml
@@ -91,7 +91,7 @@ jobs:
       os: ubuntu-22.04
       build: true
       build_installer: false
-      qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
+      qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip"
       trik_python3_version_minor: 10
 
   build-ubuntu-debug-tests:
@@ -102,7 +102,7 @@ jobs:
       build: true
       build_installer: false
       config: debug
-      qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
+      qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
       trik_python3_version_minor: 10
 
   build-altlinux-release-tests:

diff --git a/.github/workflows/setup_environment.yml b/.github/workflows/setup_environment.yml
@@ -97,6 +97,17 @@ jobs:
         submodules: recursive
         fetch-depth: 0
 
+    - name: Remove thirdparty submodules (use from libs from distro)
+      run: |
+        set -xeu
+        if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_quazip" ]]; then
+          rm -rf thirdparty/quazip
+        fi
+        if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_qscintilla2" ]]; then
+          rm -rf thirdparty/qscintilla
+        fi
+        ls thirdparty
+
     - name: Set up environment
       run: buildScripts/github/install.sh
       env:

diff --git a/buildScripts/github/install.sh b/buildScripts/github/install.sh
@@ -47,7 +47,7 @@ case "$(uname)" in
     elif [ "$ID" = "ubuntu" ]; then
       sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl libusb-1.0-0-dev \
       make qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \
-      libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5
+      libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev
     elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then
       GCC_VERSION=${GCC_VERSION:-13}
       sudo yum update -y &&  sudo yum install -y --setopt=install_weak_deps=False epel-release