From cd5e4970e61976e9275e713a1a52114bc015f4ad Mon Sep 17 00:00:00 2001 From: MinyazevR Date: Fri, 10 Jan 2025 17:48:14 +0300 Subject: [PATCH] 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._* --- .github/workflows/setup_environment.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/setup_environment.yml b/.github/workflows/setup_environment.yml index 067f9c8415..985d7d48bb 100644 --- a/.github/workflows/setup_environment.yml +++ b/.github/workflows/setup_environment.yml @@ -97,6 +97,15 @@ jobs: submodules: recursive fetch-depth: 0 + - name: Remove thirparty submodules + run: | + if [[ "${{ inputs.qmake_extra }}" =~ "use_system_quazip" ]]; then + rm -rf thirdparty/quazip/quazip + fi + if [[ "${{ inputs.qmake_extra }}" =~ "use_system_qscintilla2" ]]; then + rm -rf thirdparty/qscintilla + fi + - name: Set up environment run: buildScripts/github/install.sh env: