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>
This commit is contained in:
Daniel P. Berrangé 2022-06-29 18:06:37 +01:00 committed by Thomas Huth
parent 94b731874a
commit 37a2b95231
2 changed files with 16 additions and 13 deletions

View File

@ -1,17 +1,19 @@
# All jobs needing docker-edk2 must use the same rules it uses. # All jobs needing docker-edk2 must use the same rules it uses.
.edk2_job_rules: .edk2_job_rules:
rules: # Only run this job when ... rules:
# Run if any files affecting the build output are touched
- changes: - changes:
# this file is modified
- .gitlab-ci.d/edk2.yml - .gitlab-ci.d/edk2.yml
# or the Dockerfile is modified
- .gitlab-ci.d/edk2/Dockerfile - .gitlab-ci.d/edk2/Dockerfile
# or roms/edk2/ is modified (submodule updated)
- roms/edk2/* - roms/edk2/*
when: on_success 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 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 when: on_success
docker-edk2: docker-edk2:

View File

@ -1,18 +1,19 @@
# All jobs needing docker-opensbi must use the same rules it uses. # All jobs needing docker-opensbi must use the same rules it uses.
.opensbi_job_rules: .opensbi_job_rules:
rules: # Only run this job when ... rules:
# Run if any files affecting the build output are touched
- changes: - changes:
# this file is modified
- .gitlab-ci.d/opensbi.yml - .gitlab-ci.d/opensbi.yml
# or the Dockerfile is modified
- .gitlab-ci.d/opensbi/Dockerfile - .gitlab-ci.d/opensbi/Dockerfile
when: on_success
- changes: # or roms/opensbi/ is modified (submodule updated)
- roms/opensbi/* - roms/opensbi/*
when: on_success 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 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 when: on_success
docker-opensbi: docker-opensbi: