chore: fix pipeline (#4409)

monicahq · Sep 5, 2020 · e0a4613 · e0a4613
1 parent ade5df9
commit e0a4613
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 51 deletions.
diff --git a/.azure/azure.sig b/.azure/azure.sig
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEuNgCced4O/05ANeg4OezJU6ORAcFAl9RX/wACgkQ4OezJU6O
-RAdt8xAAkFegPbLOS7hu9Y+JVmeiYulEYh+oPJv3gwg8uQmuGZm52djPcMQMRLzT
-p33Lduqoz/55X3SNHcji8evdpvj02E0wlEGKlt5TOfSx2UxtVfw+VShI0h7W0Sov
-lsXCVXTDpmtTeoQ9AB1eMcqUwYwrOIabOEWjqhkYc4Z18bH08t1AFWi1qJBhv1Lj
-xGlioLztYUTIaSzhZ61wTtFkW7SkpJxDN7YIQMP6y6ie2bh1pM+pToQPHAfcTdba
-uCjGyz5QojZ6O9JAIdWwjLIJC4vU9LEixt6gtrcQvO7JropcM7jH4dpOsq2e48cr
-59EZxXo/LOBcgiT//we9qEYVGI2HOREKCWOt1sS1zVSjTRTUd1xfr6UpPjUPdSvG
-5RioynlAsLo9RiCLtqygv/boQpTVx62LPCZcBamy0OI0EwUCFmj8NB6jLVgmYpjV
-N1ILHFacz+dPXfxGUyBWUzPZ6bpfQZi1lm9UWPo7RYikqoSWdYkFMm158mTcOBWH
-o85OaQEUswDGufnUYeHKXptvXU6gHoAnh/yf5b4Epc9QQkJ/crRtstmhMgHAjZBk
-WTi53MoXwPthtz5XfNNl0VYZRmrpygFAguK55DdacNblRGNUWGzIFTv+nQmMJLye
-4Ycj3OVWrCd5fhJbUVaEsVqlPDWEM716m+l0yRmvt6eKpJ/E0kQ=
-=Sder
+iQIzBAABCgAdFiEEuNgCced4O/05ANeg4OezJU6ORAcFAl9R5qQACgkQ4OezJU6O
+RAfEAg/8CsLi4ymlhXF7KpDS/r7NmphQc4fQIjqKH7Dy6lhwRGo0ce94Vq5GTzbB
+wPvRjrofjQUScNmYCdUmMcs7gztRIqaNmhAFUVux6p6TaxnYRM2Obr2UuSNNwjJ/
+ioBx6+tvCbI+lLc5pltHvjha5n83QCSU+mnsHUw9QkwC1DSci0opGr/6gsctTHzN
+tpDX5lGGaSOrgl5P53DpRD3vZgEN3SpqdCNo1RA6QBhsfhnDZ77N524Z/9b4SLC0
+ED0fLM7XhPlRKB406N4hEQMfrY7gxj/f2g3zW4u5mB3xYACBa0BvSv4WQYbKBdQO
+5NseRwLeoedH3q5OuAelIymvwBwEWBu8wFbQ+J8VqCG8zn8C3RwTFqMOeY7WjQLD
+1iEYnjavb3mofQoaXfC+7lWHDFw7QHVo0r/NpXKFz5DtTq8PpkhdyVNYxz/MfeVL
+wP2IiHGBgCOaBQ3DxJB/vNbsdNjxmxufaCDMP3RcpASwV4cjDudKkdrMbJ9rUrFq
+wZV82+cQWiN9tGfj/S5TKjKvx0q5cXd9k0ZDVjTcfV/IDkOfrdwrBc9xKOucIz5m
+X6hC941Y5/5wI/k26uiHcjoD1yzFy+KBjyFCOic2xyCdPBLR2Hde5TRHi1H51lhJ
+KL12w1cnEnhbmNuvvFqbyn4e4TNCQQsEqHfmjbI8JxfihgkU5EY=
+=VgoP
 -----END PGP SIGNATURE-----
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -7,53 +7,52 @@ trigger:
   batch: 'true'
   branches:
     include:
-    - master
+      - master
   tags:
     include:
-    - '*'
+      - '*'
 pr:
   autoCancel: 'true'
   branches:
     include:
-    - '*'
+      - '*'
 
 variables:
-- group: Monica
-- name: COMPOSER_HOME
-  value: $(Pipeline.Workspace)/.composer
-- name: YARN_CACHE_FOLDER
-  value: $(Pipeline.Workspace)/.yarn
+  - group: Monica
+  - name: COMPOSER_HOME
+    value: $(Pipeline.Workspace)/.composer
+  - name: YARN_CACHE_FOLDER
+    value: $(Pipeline.Workspace)/.yarn
 
 stages:
-- stage: build
-  displayName: 'Build'
-  condition: not(startsWith(variables['System.PullRequest.SourceBranch'], 'l10n_master'))
-  jobs:
-  - template: .azure/job-build.yml
-  - template: .azure/job-tests.yml
-  - template: .azure/job-analyzers.yml
-  - template: .azure/job-test-browser.yml
-  - template: .azure/job-reporting.yml
-  - template: .azure/job-test-migrations.yml
+  - stage: build
+    displayName: 'Build'
+    condition: not(startsWith(variables['System.PullRequest.SourceBranch'], 'l10n_master'))
+    jobs:
+      - template: .azure/job-build.yml
+      - template: .azure/job-tests.yml
+      - template: .azure/job-analyzers.yml
+      - template: .azure/job-test-browser.yml
+      - template: .azure/job-reporting.yml
+      - template: .azure/job-test-migrations.yml
 
-- ${{ if in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI') }}:
-  - stage: deploy
-    displayName: Deploy
-    dependsOn: build
+  - ${{ if and(in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'), startsWith(variables['Build.SourceBranch'], 'refs/tags/')) }}:
+      - stage: deploy
+        displayName: Deploy
+        dependsOn: build
 
-    jobs:
-    - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/') }}:
-      - deployment: deploy_dist
-        pool:
-          vmImage: 'ubuntu-latest'
-        environment: monica
-        strategy:
-          runOnce:
-            deploy:
-              steps:
-              - download: none
-              - checkout: self
-              - template: .azure/step-composer-install.yml
-                parameters:
-                  no_dev: true
-              - template: .azure/step-deploy-dist.yml
+        jobs:
+          - deployment: deploy_dist
+            pool:
+              vmImage: 'ubuntu-latest'
+            environment: monica
+            strategy:
+              runOnce:
+                deploy:
+                  steps:
+                    - download: none
+                    - checkout: self
+                    - template: .azure/step-composer-install.yml
+                      parameters:
+                        no_dev: true
+                    - template: .azure/step-deploy-dist.yml