qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] gitlab-ci: Be ready for new default 'main' branch name


From: Philippe Mathieu-Daudé
Subject: [PATCH] gitlab-ci: Be ready for new default 'main' branch name
Date: Tue, 25 May 2021 17:38:25 +0200

In order to be ready for the GitLab changes in using inclusive
terminology (replacing the 'master' branch name by the 'main'
branch name), rename our use of 'master' by the $CI_DEFAULT_BRANCH
environment variable, so new forks won't be facing any issue.

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>
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f718b61fa78..db4e8490483 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -784,7 +784,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
@@ -797,7 +797,7 @@ 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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]