summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@qt.io>2023-09-28 08:08:59 +0300
committerSimo Fält <simo.falt@qt.io>2023-09-29 04:38:17 +0000
commitce09de5809fc22ca7e0c8114fbde3577cac668de (patch)
treef6aaf12b0695db45b1be26bd7ad2f4183d057879
parentccd827be0a5b796703eda504364a742a40d84c39 (diff)
CI: Fix resolving dependencies with Debian packages
Pick-to: dev 6.6 Change-Id: Ia057c34318daff2d63237d523803a4231a621da1 Reviewed-by: Toni Saario <toni.saario@qt.io>
-rw-r--r--coin/instructions/debian/debian_build_module.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/instructions/debian/debian_build_module.yaml b/coin/instructions/debian/debian_build_module.yaml
index 6e77a8b346..a302c07bef 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"]