Trying to get master back on track (#962)

Fixing the counter function

scripts/azure-pipelines.yml

@@ -1,17 +1,13 @@
 trigger:
   - master
-  - development
-
-pr:
-  - master
-  - development
+  - refs/tags/*
 
 variables:
   FEATURE_NAME_PREFIX: 'feature/'
   VERBOSITY: normal
   GIT_SHA: $(Build.SourceVersion)
   GIT_BRANCH_NAME: $(Build.SourceBranchName)
-  BUILD_NUMBER: $[counter('$(Build.SourceBranchName)_counter', 1)]
+  BUILD_NUMBER: $[counter(format('{0}_counter', variables['Build.SourceBranchName']), 1)]
   FEATURE_NAME: ''
   PREVIEW_LABEL: 'rc'
   NATIVE_LINUX_PACKAGES: curl mono-complete msbuild python git libfontconfig1-dev clang-3.8 make
@@ -48,14 +44,12 @@ stages:
           displayName: Build Native Android (Windows)
           vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-android
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (Windows)
         parameters:
           name: native_tizen_windows
           displayName: Build Native Tizen (Windows)
           vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-tizen
-          buildExternals: $(DOWNLOAD_EXTERNALS)
           condition: false # TODO: TIZEN INSTALL BUGS
       - template: azure-templates-bootstrapper.yml # Build Native UWP (Windows)
         parameters:
@@ -63,14 +57,12 @@ stages:
           displayName: Build Native UWP (Windows)
           vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-uwp
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native Win32 (Windows)
         parameters:
           name: native_win32_windows
           displayName: Build Native Win32 (Windows)
           vmImage: $(VM_IMAGE_WINDOWS)
           target: externals-windows
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       # NATIVE JOBS - MAC
       - template: azure-templates-bootstrapper.yml # Build Native Android (macOS)
         parameters:
@@ -78,28 +70,24 @@ stages:
           displayName: Build Native Android (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-android
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native iOS (macOS)
         parameters:
           name: native_ios_macos
           displayName: Build Native iOS (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-ios
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native macOS (macOS)
         parameters:
           name: native_macos_macos
           displayName: Build Native macOS (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-macos
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (macOS)
         parameters:
           name: native_tizen_macos
           displayName: Build Native Tizen (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-tizen
-          buildExternals: $(DOWNLOAD_EXTERNALS)
           condition: false # TODO: TIZEN INSTALL BUGS
       - template: azure-templates-bootstrapper.yml # Build Native tvOS (macOS)
         parameters:
@@ -107,14 +95,12 @@ stages:
           displayName: Build Native tvOS (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-tvos
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-bootstrapper.yml # Build Native watchOS (macOS)
         parameters:
           name: native_watchos_macos
           displayName: Build Native watchOS (macOS)
           vmImage: $(VM_IMAGE_MAC)
           target: externals-watchos
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       # NATIVE JOBS - LINUX
       - template: azure-templates-native-linux.yml # Build Native Linux (Linux)
         parameters:
@@ -123,7 +109,6 @@ stages:
           vmImage: $(VM_IMAGE_LINUX)
           packages: $(NATIVE_LINUX_PACKAGES)
           target: externals-linux
-          buildExternals: $(DOWNLOAD_EXTERNALS)
       - template: azure-templates-native-linux.yml # Build Native Linux [No Dependencies] (Linux)
         parameters:
           name: native_linux_nodependencies_linux
@@ -131,7 +116,6 @@ stages:
           vmImage: $(VM_IMAGE_LINUX)
           packages: $(NATIVE_LINUX_PACKAGES)
           target: externals-linux
-          buildExternals: $(DOWNLOAD_EXTERNALS)
           additionalArgs: --additionalGnArgs="skia_use_fontconfig=false"
       - template: azure-templates-bootstrapper.yml # Build Native Tizen (Linux)
         parameters:
@@ -140,7 +124,6 @@ stages:
           vmImage: $(VM_IMAGE_LINUX)
           packages: $(TIZEN_LINUX_PACKAGES)
           target: externals-tizen
-          buildExternals: $(DOWNLOAD_EXTERNALS)
 
   - stage: managed
     displayName: Build Managed

scripts/azure-templates-bootstrapper.yml

@@ -13,21 +13,20 @@ parameters:
   retryCount: 1                                 # the number of times to retry the bootstrapper
   condition: succeeded()                        # whether or not to run this template
   shouldPublish: true                           # whether or not to publish the artifacts
-  configuration: '$(CONFIGURATION)'             # the build configuration
-  buildExternals: '$(DOWNLOAD_EXTERNALS)'       # the build number to download externals from
-  verbosity: '$(VERBOSITY)'                     # the level of verbosity to use when building
+  configuration: $(CONFIGURATION)               # the build configuration
+  buildExternals: $(DOWNLOAD_EXTERNALS)         # the build number to download externals from
+  verbosity: $(VERBOSITY)                       # the level of verbosity to use when building
 
 jobs:
-# - ${{ if and(parameters.buildExternals, startsWith(parameters.name, 'native_')) }}:
+# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
 #   - template: azure-templates-download.yml
 #     parameters:
 #       name: ${{ parameters.name }}
 #       displayName: ${{ parameters.displayName }}
 #       vmImage: ${{ parameters.vmImage }}
 #       condition: ${{ parameters.condition }}
-#       buildExternals: ${{ parameters.buildExternals }}
 
-# - ${{ if or(not(parameters.buildExternals), not(startsWith(parameters.name, 'native_'))) }}:
+# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 120

scripts/azure-templates-download.yml

@@ -3,7 +3,7 @@ parameters:
   displayName: ''                               # the human name
   vmImage: ''                                   # the VM image
   condition: succeeded()                        # whether or not to run this template
-  buildExternals: '$(DOWNLOAD_EXTERNALS)'       # the build number to download externals from
+  buildExternals: $(DOWNLOAD_EXTERNALS)         # the build number to download externals from
 
 jobs:
   - job: ${{ parameters.name }}

scripts/azure-templates-native-linux.yml

@@ -8,20 +8,19 @@ parameters:
   postBuildSteps: []                            # any additional steps to run after the build
   additionalArgs: ''                            # any additional arguments to pass to the bootstrapper
   retryCount: 1                                 # the number of times to retry the bootstrapper
-  configuration: '$(CONFIGURATION)'             # the build configuration
-  buildExternals: '$(DOWNLOAD_EXTERNALS)'       # the build number to download externals from
-  verbosity: '$(VERBOSITY)'                     # the level of verbosity to use when building
+  configuration: $(CONFIGURATION)               # the build configuration
+  buildExternals: $(DOWNLOAD_EXTERNALS)         # the build number to download externals from
+  verbosity: $(VERBOSITY)                       # the level of verbosity to use when building
 
 jobs:
-# - ${{ if and(parameters.buildExternals, startsWith(parameters.name, 'native_')) }}:
+# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
 #   - template: azure-templates-download.yml
 #     parameters:
 #       name: ${{ parameters.name }}
 #       displayName: ${{ parameters.displayName }}
 #       vmImage: ${{ parameters.vmImage }}
-#       buildExternals: ${{ parameters.buildExternals }}
 
-# - ${{ if or(not(parameters.buildExternals), not(startsWith(parameters.name, 'native_'))) }}:
+# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
   - job: ${{ parameters.name }}
     displayName: ${{ parameters.displayName }}
     timeoutInMinutes: 120