diff options
| author | Simo Fält <simo.falt@qt.io> | 2023-09-28 08:08:59 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-29 06:23:57 +0000 |
| commit | e20328d84f4e6c0db5d0a93e3f136cc178bee05b (patch) | |
| tree | 0375885306eaa98f3118a0b2287d839cf02bc10d /coin | |
| parent | 2fd9735e7aee9f6c6c014c3e4d33b420f7ef5375 (diff) | |
CI: Fix resolving dependencies with Debian packages
Pick-to: 6.6
Change-Id: Ia057c34318daff2d63237d523803a4231a621da1
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit ce09de5809fc22ca7e0c8114fbde3577cac668de)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/debian/debian_build_module.yaml | 3 |
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"] |