diff --git a/.gitlab-ci b/.gitlab-ci index ef08f4efda5cd346d8750db962bb6dfd066dc3f7..2c19f7ede2a689e14619908df1cea34a975be721 160000 --- a/.gitlab-ci +++ b/.gitlab-ci @@ -1 +1 @@ -Subproject commit ef08f4efda5cd346d8750db962bb6dfd066dc3f7 +Subproject commit 2c19f7ede2a689e14619908df1cea34a975be721 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db9fd3d5e9b19a3442a13712c66befccced765d2..a65f94d669eadcbcf5f3e3452004dbf17514a00e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,9 +4,13 @@ # --------------------------------------------------------------------------------------- include: - project: '${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/gitlab-ci' - ref: ef08f4efda5cd346d8750db962bb6dfd066dc3f7 + ref: 2c19f7ede2a689e14619908df1cea34a975be721 file: 'manifest-integration-yocto.yml' variables: - MASTER_BRANCH_PROJECT: master + GITLAB_CI_REVISION: 2c19f7ede2a689e14619908df1cea34a975be721 BB_RECIPE_NAME: qt-multi-screen-compositor + # FIXME: This is only necessary due to the following GitLab limitation: + # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 + # As soon as this gets fixed upstream, the hard-coded branch name should be removed. + MASTER_BRANCH: master