diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-10-07 15:22:36 +0530 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2022-10-10 07:02:58 +0000 |
| commit | 2d838a9b3dddd1abe29ee9498bed42617c3608cf (patch) | |
| tree | 35ee1111538274a001dd8096da0216b6f9065193 /.gitlab-ci.yml | |
| parent | 2df2dfce55b539a3a58eebefaa78ffc3e23333d6 (diff) | |
| download | gstreamer-2d838a9b3dddd1abe29ee9498bed42617c3608cf.tar.gz | |
ci: Fix website regen on push
Don't make the integrate stage manual, we need it to regen the website
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3134>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e6b7439b42..b28c7a5440 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,8 +112,9 @@ trigger: rules: # If the MR is assigned to the Merge bot, trigger the pipeline automatically - if: '$CI_MERGE_REQUEST_ASSIGNEES == "gstreamer-merge-bot"' - # Require explicit action to trigger tests post merge - - if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH' + # Require explicit action to trigger tests post merge, but we want to + # automatically trigger the integratation stage + - if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH && $CI_JOB_STAGE != "integrate"' when: 'manual' # When the assignee isn't the merge bot, require an explicit action to trigger the pipeline # to avoid wasting CI resources |