diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2022-06-29 18:06:37 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2022-07-05 09:33:58 +0200 |
| commit | 37a2b95231d6699536820c8ff0ca3f5ba8356184 (patch) | |
| tree | 9b92bbd5be36203b9cd94243d27fdd83d0adcb99 | |
| parent | 94b731874a853cebc50f8e30c85c9c533a690c05 (diff) | |
| download | focaccia-qemu-37a2b95231d6699536820c8ff0ca3f5ba8356184.tar.gz focaccia-qemu-37a2b95231d6699536820c8ff0ca3f5ba8356184.zip | |
gitlab: tweak comments in edk2/opensbi jobs
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> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220629170638.520630-3-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/edk2.yml | 14 | ||||
| -rw-r--r-- | .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: |