Skip to content

Commit 3fc415f

Browse files
committed
Merge branch 'ci/revert-merge-request-pipelines' into 'main'
Revert "Merge branch 'ci/merge-request-pipeline' into 'main'" See merge request Sharpmake/sharpmake!617
2 parents 6d6bd3f + 4c9dc3f commit 3fc415f

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

.gitlab/.gitlab-ci.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1+
# Pipelines runs only on branches and tags.
2+
# Disable merge request pipelines, pipelines for merge results and merge trains.
13
include:
4+
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
25
- project: 'Sharpmake/SharpmakeExtended'
36
file: 'build/sharpmake-ci.yml'
47

5-
workflow:
6-
rules:
7-
# Enable merge request pipelines.
8-
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
9-
# Avoid duplicate pipelines when pushing in a branch.
10-
- if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
11-
when: never
12-
# Else run pipelines for branches and tags.
13-
- if: $CI_COMMIT_BRANCH
14-
- if: $CI_COMMIT_TAG
15-
168
stages:
179
- build
1810
- test

.gitlab/Get-SamplesPipeline.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ foreach ($sample in $samplesDef.Samples)
9393

9494
# Merge sample properties into a single hash table.
9595
$sampleJob = $osProperties + @{
96-
rules = @(
97-
@{ if = '$CI_PIPELINE_SOURCE == "parent_pipeline"' }
98-
)
9996
artifacts = [PSCustomObject]@{
10097
when = 'on_failure'
10198
untracked = $true

0 commit comments

Comments
 (0)