diff --git a/conda_smithy/templates/azure-pipelines.yml.tmpl b/conda_smithy/templates/azure-pipelines.yml.tmpl index b649de93a..9c8fd3324 100644 --- a/conda_smithy/templates/azure-pipelines.yml.tmpl +++ b/conda_smithy/templates/azure-pipelines.yml.tmpl @@ -28,7 +28,7 @@ stages: echo "##vso[task.setvariable variable=log]$git_log" displayName: Obtain commit message - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: and(eq(variables['Build.Reason'], 'PullRequest'), or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'))) displayName: Skip build? - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result diff --git a/news/2110-azure-skip-only-pr.rst b/news/2110-azure-skip-only-pr.rst new file mode 100644 index 000000000..0ff57d8d0 --- /dev/null +++ b/news/2110-azure-skip-only-pr.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* Fixed a bug where azure would skip commits on main if previous commit had '[ci skip]' or similar. (#2110) + +**Security:** + +*