diff --git a/CHANGELOG.md b/CHANGELOG.md index f8363c1..40e327b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,6 +33,7 @@ multiple products dor the same `Title`. Fixed verbose output of Languages in UpdateServiceServer - Fix issue [#63](https://github.com/dsccommunity/UpdateServicesDsc/issues/63), Fixed verbose output of WSUS server in UpdateServicesApprovalRule +- Fixed the `azure-pipelines.yml` to trigger on main not master. ## [1.2.0] - 2020-05-18 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7858848..9160e45 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,7 +1,7 @@ trigger: branches: include: - - master + - main paths: exclude: - CHANGELOG.md @@ -15,7 +15,7 @@ variables: buildFolderName: output buildArtifactName: output testResultFolderName: testResults - defaultBranch: master + defaultBranch: main stages: - stage: Build @@ -126,12 +126,12 @@ stages: - stage: Deploy dependsOn: Test - # Only execute deploy stage if we're on master and previous stage succeeded + # Only execute deploy stage if we're on main and previous stage succeeded condition: | and( succeeded(), or( - eq(variables['Build.SourceBranch'], 'refs/heads/master'), + eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/tags/') ), contains(variables['System.TeamFoundationCollectionUri'], 'dsccommunity')