From e20328d84f4e6c0db5d0a93e3f136cc178bee05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 28 Sep 2023 08:08:59 +0300 Subject: [PATCH] CI: Fix resolving dependencies with Debian packages Pick-to: 6.6 Change-Id: Ia057c34318daff2d63237d523803a4231a621da1 Reviewed-by: Toni Saario (cherry picked from commit ce09de5809fc22ca7e0c8114fbde3577cac668de) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/debian/debian_build_module.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/instructions/debian/debian_build_module.yaml b/coin/instructions/debian/debian_build_module.yaml index 6e77a8b3469..a302c07bef2 100644 --- a/coin/instructions/debian/debian_build_module.yaml +++ b/coin/instructions/debian/debian_build_module.yaml @@ -103,10 +103,11 @@ instructions: contains_value: "MISSING_DEBIAN_INST" - type: ExecuteCommand command: ["sbuild", - "--build-dep-resolver=aptitude", + "--build-dep-resolver=apt", "-sAd", "tqtc-focal", "-c", "{{.Env.COIN_SBUILD_CHROOT}}", "--build-dir", "output/debian_packages", + "--extra-repository={{.Env.COIN_EXTRA_DEBIAN_REPO}}", "--extra-package={{.Env.COIN_EXTRA_DEBIAN_PACKAGES}}", "--extra-package={{.AgentWorkingDir}}/debian_packages/", "qt-{{.Env.QT_REPO_MODULE_VERSION}}-{{.Env.TESTED_MODULE_PLAIN_COIN}}-src_{{.Env.QT_REPO_MODULE_VERSION}}-1.dsc"]