Skip to content

Commit 5df6b75

Browse files
Update CI and release pipeline for branch name changes (#766)
1 parent 3180af5 commit 5df6b75

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

.ci/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ trigger:
44
batch: true
55
branches:
66
include:
7-
- master
7+
- main
88
- release/*
9-
- v2
9+
- v1
1010
pr:
1111
branches:
1212
include:
13-
- master
13+
- main
1414
- release/*
15-
- v2
15+
- v1
1616

1717
resources:
1818
repositories:

.pipelines/PlatyPS-Official.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ schedules:
77
displayName: Weekly Build
88
branches:
99
include:
10-
- v2
10+
- release/*
11+
- main
1112
always: true
1213

1314
parameters:

tools/releaseBuild/release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ trigger: none
44
pr:
55
branches:
66
include:
7-
- v2
8-
- release/v2/*
7+
- main
8+
- release/*
99

1010
variables:
1111
- group: ESRP
@@ -38,7 +38,6 @@ stages:
3838
$versionString = if ($env:RELEASE_VERSION -eq 'fromBranch') {
3939
$branch = $env:BUILD_SOURCEBRANCH
4040
$branchOnly = $branch -replace '^refs/heads/'
41-
$branchOnly -replace '^.*(release/v2[-/])'
4241
}
4342
else {
4443
$env:RELEASE_VERSION

tools/releaseBuild/template/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
stages:
77
- stage: ${{ parameters.stageName }}
88
displayName: Release Microsoft.PowerShell.PlatyPS to '${{ parameters.stageName }}'
9-
condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/v2'))
9+
condition: and(succeeded(), eq(variables['Build.Reason'], 'Manual'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
1010

1111
jobs:
1212
- deployment: Publish_${{ parameters.stageName }}

0 commit comments

Comments
 (0)