Push master to CI feed

griesoft · Feb 15, 2020 · 1a5744e · 1a5744e
1 parent 67983af
commit 1a5744e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -31,7 +31,7 @@ jobs:
           }
           else
           {
-            Write-Host "##vso[task.setvariable variable=version;isOutput=true]$(major).$(minor).$(patch)-alpha$(Build.BuildId)"
+            Write-Host "##vso[task.setvariable variable=version;isOutput=true]$(major).$(minor).$(patch)-ci$(Build.BuildId)"
           }
         displayName: Set Package Version
         name: package
@@ -76,7 +76,7 @@ jobs:
     dependsOn: 
       - BuildPack
       - Test
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/dev'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     environment: Development
     strategy:
       runOnce: