Skip to content

Commit 8c56cf9

Browse files
MinyazevRiakov
andauthored
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 <iakov@users.noreply.github.com>
1 parent b86d55e commit 8c56cf9

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/workflows/common_build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
os: ubuntu-22.04
9292
build: true
9393
build_installer: false
94-
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
94+
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip"
9595
trik_python3_version_minor: 10
9696

9797
build-ubuntu-debug-tests:
@@ -102,7 +102,7 @@ jobs:
102102
build: true
103103
build_installer: false
104104
config: debug
105-
qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
105+
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"
106106
trik_python3_version_minor: 10
107107

108108
build-altlinux-release-tests:

.github/workflows/setup_environment.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,17 @@ jobs:
9797
submodules: recursive
9898
fetch-depth: 0
9999

100+
- name: Remove thirdparty submodules (use from libs from distro)
101+
run: |
102+
set -xeu
103+
if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_quazip" ]]; then
104+
rm -rf thirdparty/quazip
105+
fi
106+
if [[ "${{ inputs.qmake_extra }}" =~ "+=use_system_qscintilla2" ]]; then
107+
rm -rf thirdparty/qscintilla
108+
fi
109+
ls thirdparty
110+
100111
- name: Set up environment
101112
run: buildScripts/github/install.sh
102113
env:

buildScripts/github/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ case "$(uname)" in
4747
elif [ "$ID" = "ubuntu" ]; then
4848
sudo apt-get update && sudo apt-get install -y --no-install-recommends ccache curl libusb-1.0-0-dev \
4949
make qtscript5-dev qttools5-dev-tools qtmultimedia5-dev libqt5serialport5-dev libqt5svg5-dev \
50-
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5
50+
libudev-dev "$TRIK_PYTHON"-dev qtbase5-private-dev qtwayland5 libqscintilla2-qt5-dev libquazip5-dev
5151
elif [[ "$ID" = "rocky" || "$ID" = '"rocky"' ]]; then
5252
GCC_VERSION=${GCC_VERSION:-13}
5353
sudo yum update -y && sudo yum install -y --setopt=install_weak_deps=False epel-release

0 commit comments

Comments
 (0)