[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] gitlab: tweak comments in edk2/opensbi jobs
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 2/3] gitlab: tweak comments in edk2/opensbi jobs |
Date: |
Wed, 29 Jun 2022 18:06:37 +0100 |
Get rid of comments stating the obvious and re-arrange remaining
comments. The opensbi split of rules for file matches is also
merged into one rule.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
.gitlab-ci.d/edk2.yml | 14 ++++++++------
.gitlab-ci.d/opensbi.yml | 15 ++++++++-------
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.d/edk2.yml b/.gitlab-ci.d/edk2.yml
index fbe763a282..905e02440f 100644
--- a/.gitlab-ci.d/edk2.yml
+++ b/.gitlab-ci.d/edk2.yml
@@ -1,17 +1,19 @@
# All jobs needing docker-edk2 must use the same rules it uses.
.edk2_job_rules:
- rules: # Only run this job when ...
+ rules:
+ # Run if any files affecting the build output are touched
- changes:
- # this file is modified
- .gitlab-ci.d/edk2.yml
- # or the Dockerfile is modified
- .gitlab-ci.d/edk2/Dockerfile
- # or roms/edk2/ is modified (submodule updated)
- roms/edk2/*
when: on_success
- - if: '$CI_COMMIT_REF_NAME =~ /^edk2/' # or the branch/tag starts with
'edk2'
+
+ # Run if the branch/tag starts with 'edk2'
+ - if: '$CI_COMMIT_REF_NAME =~ /^edk2/'
when: on_success
- - if: '$CI_COMMIT_MESSAGE =~ /edk2/i' # or last commit description
contains 'EDK2'
+
+ # Run if last commit msg contains 'EDK2' (case insensitive)
+ - if: '$CI_COMMIT_MESSAGE =~ /edk2/i'
when: on_success
docker-edk2:
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index 0745ccdf10..753a003f93 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -1,18 +1,19 @@
# All jobs needing docker-opensbi must use the same rules it uses.
.opensbi_job_rules:
- rules: # Only run this job when ...
+ rules:
+ # Run if any files affecting the build output are touched
- changes:
- # this file is modified
- .gitlab-ci.d/opensbi.yml
- # or the Dockerfile is modified
- .gitlab-ci.d/opensbi/Dockerfile
- when: on_success
- - changes: # or roms/opensbi/ is modified (submodule updated)
- roms/opensbi/*
when: on_success
- - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/' # or the branch/tag starts with
'opensbi'
+
+ # Run if the branch/tag starts with 'opensbi'
+ - if: '$CI_COMMIT_REF_NAME =~ /^opensbi/'
when: on_success
- - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i' # or last commit description
contains 'OpenSBI'
+
+ # Run if the last commit msg contains 'OpenSBI' (case insensitive)
+ - if: '$CI_COMMIT_MESSAGE =~ /opensbi/i'
when: on_success
docker-opensbi:
--
2.36.1