From d84b3c1ccab6ce8f64589bb278e11f13c2fc4dca Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Wed, 25 Sep 2019 18:32:58 -0500
Subject: [PATCH] Revert "extract some duplicated configs to vars"

This reverts commit 4516c1de20efdf769883ef7cc89e97e5fafb9698.
---
 azure-pipelines.web.yaml | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/azure-pipelines.web.yaml b/azure-pipelines.web.yaml
index 28dbb58b6..6337323f0 100644
--- a/azure-pipelines.web.yaml
+++ b/azure-pipelines.web.yaml
@@ -1,6 +1,9 @@
-variables:
-  - name: triggerIncludePaths
-    value:
+trigger:
+  batch: false
+  branches:
+    include: ["master"]
+  paths:
+    include:
       [
         "azure-pipelines.web.yaml",
         "src/FilterLists.Web/*",
@@ -8,22 +11,20 @@ variables:
         "docker-compose.yml",
         "docker-compose.prod.yml",
       ]
-  - name: onSuccessAndMasterCondition
-    value: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))"
-
-trigger:
-  batch: false
-  branches:
-    include: ["master"]
-  paths:
-    include: ${{ variables.triggerIncludePaths }}
 
 pr:
   autoCancel: false
   branches:
     include: ["master"]
   paths:
-    include: ${{ variables.triggerIncludePaths }}
+    include:
+      [
+        "azure-pipelines.web.yaml",
+        "src/FilterLists.Web/*",
+        ".dockerignore",
+        "docker-compose.yml",
+        "docker-compose.prod.yml",
+      ]
 
 pool:
   vmImage: "ubuntu-latest"
@@ -50,7 +51,7 @@ steps:
       tags: |
         latest
         $(Build.BuildId)
-    condition: ${{ variables.onSuccessAndMasterCondition }}
+    condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))"
 
   - task: CopyFiles@2
     displayName: "stage docker-compose files"
@@ -62,7 +63,7 @@ steps:
       TargetFolder: "$(Build.ArtifactStagingDirectory)"
       CleanTargetFolder: true
       OverWrite: true
-    condition: ${{ variables.onSuccessAndMasterCondition }}
+    condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))"
 
   - task: PublishBuildArtifacts@1
     displayName: "publish docker-compose files"
@@ -70,4 +71,4 @@ steps:
       PathtoPublish: "$(Build.ArtifactStagingDirectory)"
       ArtifactName: "drop"
       publishLocation: "Container"
-    condition: ${{ variables.onSuccessAndMasterCondition }}
+    condition: "and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))"