Skip to content

Commit 5d14692

Browse files
author
Maxim Zaytsev
authored
Fix condition (#360)
1 parent 4e7fd28 commit 5d14692

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

azure-pipelines.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
trigger:
2+
- master
3+
- releases/*
4+
15
variables:
26
isMaster: $[eq(variables['Build.SourceBranch'], 'refs/heads/master')]
37
isRelease: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/releases')]
@@ -11,6 +15,11 @@ parameters:
1115
type: object
1216
default: ['windows-latest', 'ubuntu-latest']
1317

18+
- name: publishToNpm
19+
displayName: Publish to npm
20+
type: boolean
21+
default: false
22+
1423
stages:
1524
- stage: Build
1625
displayName: Build typed-rest-client
@@ -72,7 +81,7 @@ stages:
7281
displayName: npm run test
7382

7483
- stage: Publish
75-
condition: or(eq(variables.isRelease, true), eq(variables.isMaster, true))
84+
condition: and(succeeded(), or(eq('${{ parameters.publishToNpm }}', true), eq(variables.isRelease, true), eq(variables.isMaster, true)))
7685
jobs:
7786
- job: Publish_package
7887
displayName: Publish npm package
@@ -92,4 +101,4 @@ stages:
92101
workingDir: '_build'
93102
publishRegistry: useExternalRegistry
94103
publishEndpoint: NPM-Automation-Token
95-
continueOnError: true
104+
continueOnError: true

0 commit comments

Comments
 (0)