[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master' |
Date: |
Wed, 26 May 2021 23:18:36 +0200 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
We want to skip the checkpatch and DCO signoff jobs when
pushing to the default branch. Currently this branch is
called 'master', but we don't need to hardcode this in
the CI configuration, because the $CI_DEFAULT_BRANCH
env variable exposes it.
References:
- https://sfconservancy.org/news/2020/jun/23/gitbranchname/
- https://about.gitlab.com/blog/2021/03/10/new-git-default-branch-name/
Suggested-by: Savitoj Singh <savsingh@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20210525153826.4174157-1-philmd@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
---
.gitlab-ci.d/static_checks.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml
index f695627b7cd..9c9a771b744 100644
--- a/.gitlab-ci.d/static_checks.yml
+++ b/.gitlab-ci.d/static_checks.yml
@@ -6,7 +6,7 @@ check-patch:
script: .gitlab-ci.d/check-patch.py
except:
variables:
- - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
'master'
+ - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
$CI_DEFAULT_BRANCH
variables:
GIT_DEPTH: 1000
allow_failure: true
@@ -19,6 +19,6 @@ check-dco:
script: .gitlab-ci.d/check-dco.py
except:
variables:
- - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
'master'
+ - $CI_PROJECT_NAMESPACE == 'qemu-project' && $CI_COMMIT_BRANCH ==
$CI_DEFAULT_BRANCH
variables:
GIT_DEPTH: 1000
--
2.26.3
- [PULL 07/19] gitlab: Extract build stages to stages.yml, (continued)
- [PULL 07/19] gitlab: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 08/19] gitlab: Extract default build/test jobs templates, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 09/19] gitlab: Extract core container jobs to container-core.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 10/19] gitlab: Drop linux user build job for CentOS 7, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 12/19] gitlab: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 13/19] gitlab: Document how forks can use different set of jobs, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 14/19] gitlab: Extract cross-container jobs to container-cross.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 15/19] gitlab: Keep Avocado reports during 1 week, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 16/19] gitlab: Run Avocado tests manually (except mainstream CI), Philippe Mathieu-Daudé, 2021/05/26
- [PULL 17/19] gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master',
Philippe Mathieu-Daudé <=
- [PULL 18/19] gitlab: Convert check-dco/check-patch jobs to the 'rules' syntax, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 19/19] gitlab: Split gprof-gcov job, Philippe Mathieu-Daudé, 2021/05/26
- Re: [PULL 00/19] gitlab-ci patches for 2021-05-26, Peter Maydell, 2021/05/27