diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2021-05-25 17:30:57 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-05-27 16:39:23 +0200 |
| commit | 1f88fad50eb7412e27e0db2c4e37cb9e982ffa80 (patch) | |
| tree | f61e0e85dc9e1fe1cedb94bcf07e5a919f4a0d27 | |
| parent | f56bf4caf7179c82a50e3f7618f335526fba37d3 (diff) | |
gitlab: Use $CI_DEFAULT_BRANCH instead of hardcoded 'master'
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>
| -rw-r--r-- | .gitlab-ci.d/static_checks.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml index f695627b7c..9c9a771b74 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 |