From 31728db161137079001f45cd6d9ed875225abbae Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Wed, 25 Sep 2019 18:31:27 -0500
Subject: [PATCH] fix variables

---
 azure-pipelines.web.yaml | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

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