diff options
| author | Michel Dänzer <[email protected]> | 2020-04-03 12:50:11 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-07 17:36:15 +0000 |
| commit | 42fe600c0c27f2605fa616af4ffce157598d7253 (patch) | |
| tree | af27bff191f5d780d91fdc52c854be028ea813da /.gitlab-ci.yml | |
| parent | 27c4ef13977f0f80925f5182bcaaaf3489be7b5a (diff) | |
gitlab-ci: Don't require triggering build/test jobs manually
Let them run automatically once all their dependencies have passed.
Reviewed-by: Adam Jackson <[email protected]>
Acked-by: Alyssa Rosenzweig <[email protected]>
Reviewed-by: Pierre-Eric Pelloux-Prayer <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4432>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8623731960b..dcdb06a2a5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,9 +25,9 @@ stages: # When to automatically run the CI .ci-run-policy: rules: - # Run pipeline by default for merge requests changing files affecting it - - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' - changes: &all_paths + # If any files affecting the pipeline are changed, build/test jobs run + # automatically once all dependency jobs have passed + - changes: &all_paths - VERSION - bin/**/* # GitLab CI @@ -45,16 +45,7 @@ stages: - include/**/* - src/**/* when: on_success - # Run pipeline by default in the main project if files affecting it were - # changed - - if: '$CI_PROJECT_PATH == "mesa/mesa"' - changes: - *all_paths - when: on_success - # Allow triggering jobs manually on branches of forked projects - - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' - when: manual - # Otherwise, most jobs won't run + # Otherwise, build/test jobs won't run - when: never retry: max: 2 @@ -108,6 +99,26 @@ success: stage: container extends: - .ci-run-policy + rules: + # Run pipeline by default if it is for a merge request and any files + # affecting it were changed + - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == $CI_COMMIT_REF_NAME' + changes: + *all_paths + when: on_success + # Run pipeline by default in the main project if any files affecting it were + # changed + - if: '$CI_PROJECT_PATH == "mesa/mesa"' + changes: + *all_paths + when: on_success + # Allow triggering jobs manually for branches of forked projects + - if: '$CI_PROJECT_PATH != "mesa/mesa" && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME != $CI_COMMIT_REF_NAME' + changes: + *all_paths + when: manual + # Otherwise, container jobs won't run + - when: never variables: FDO_DISTRIBUTION_VERSION: buster-slim FDO_REPO_SUFFIX: "debian/$CI_JOB_NAME" |