From e1e120ca12a10b2cb8a1f69f586ad87a87c82517 Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Fri, 15 Oct 2021 21:15:00 +0200
Subject: [PATCH] .gitlab-ci.yml: fix order of includes
The machines-and-flavours.yaml file needs to be included after
build-generic.yaml. Order matters because of the delicate manner
in which they override and extend jobs seen previously.
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f7e8b5b..83f35ca6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,9 +26,9 @@ include:
file:
- 'dco.yaml'
- 'reuse.yaml'
- - local: '/.oniro-ci/machines-and-flavours.yaml'
- local: '/.oniro-ci/build-generic.yaml'
- local: '/.oniro-ci/test-generic.yaml'
+ - local: '/.oniro-ci/machines-and-flavours.yaml'
dco:
extends: .dco
--
GitLab