diff options
| author | Romain Hunault <romain.hunault@e.email> | 2022-04-05 18:23:04 +0000 |
|---|---|---|
| committer | Romain Hunault <romain.hunault@e.email> | 2022-04-05 18:23:04 +0000 |
| commit | 752ee5975d0d1b75ef773b4d7e20ad00fac96519 (patch) | |
| tree | d3abbbad472ed6a889bc3c0fa334329c01d35b4b /.gitlab-ci.yml | |
| parent | 250da848583f1fbd2d6658339fc758d22c67e938 (diff) | |
| parent | 1116394343fe8cb489f5405ab3c61b5e1ce78a50 (diff) | |
Merge branch '5217_blocked_trackers' into 'main'
5217 - Display blocked trackers, 5216 : add leaks in tooltips
See merge request e/privacy-central/privacycentralapp!39
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f434384..97be945 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ quality-analysis: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: never @@ -57,7 +57,7 @@ build-debug: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: never @@ -73,7 +73,7 @@ test-debug: rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' when: never - - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "main"' when: never - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' when: never |