Build yaml files refactor

build/bf-cli-build-test-steps.yml

@@ -0,0 +1,73 @@
+steps:
+- bash: |
+    short_hash=`git rev-parse --short=7 HEAD`  ## At least 7 digits, more if needed for uniqueness
+    echo "Full git hash:  $(Build.SourceVersion)"
+    echo "Short git hash: $short_hash"
+    echo "##vso[task.setvariable variable=short_hash]$short_hash"  ## Store variable for subsequent steps
+  workingDirectory: $(Build.SourcesDirectory)
+  displayName: Get commit number
+
+- powershell: |
+    $date = (Get-Date).ToString("yyyyMMdd")
+    echo "##vso[task.setvariable variable=buildDate]$date"  ## Store variable for subsequent steps
+  displayName: Get formatted date
+
+- bash: |
+    version=`echo "$(version)"`
+    _version=`echo "$(_version)"`
+    echo "version:  $version"
+    echo "_version:  $_version"
+    [  -z "$version" ] && buildVersion=$_version.$(buildDate).$(short_hash) || buildVersion=$version
+    echo "buildVersion:  $buildVersion"
+    echo "##vso[task.setvariable variable=buildVersion]$buildVersion"  ## Store variable for subsequent steps
+  workingDirectory: $(Build.SourcesDirectory)
+  displayName: Define Build Version
+
+- task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
+  displayName: 'Tag Build with version number'
+  inputs:
+    tags: 'Version=$(buildVersion)'
+  continueOnError: true
+
+- task: NodeTool@0
+  displayName: 'Use Node 12.x'
+  inputs:
+    versionSpec: 12.x
+
+- task: Npm@1
+  displayName: 'npm install --global @microsoft/rush'
+  inputs:
+    command: custom
+    verbose: false
+    customCommand: 'install --global @microsoft/rush'
+
+- script: 'rush update'
+  displayName: 'rush update'
+
+- script: 'rush build -p 2'
+  displayName: 'rush build -p 2'
+
+- script: 'rush test'
+  displayName: 'rush test'
+
+- script: 'node ./common/scripts/version-and-pack.js --version $(buildVersion)'
+  displayName: 'Version and Pack'
+
+- task: CopyFiles@2
+  displayName: 'Copy packages to: $(Build.ArtifactStagingDirectory)/drop'
+  inputs:
+    SourceFolder: ./.output
+    Contents: '**/*.tgz'
+    TargetFolder: '$(Build.ArtifactStagingDirectory)/drop'
+    flattenFolders: true
+
+- task: PublishBuildArtifacts@1
+  displayName: 'Publish Artifact: drop'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)/drop'
+    ArtifactName: drop
+
+- powershell: 'Get-ChildItem .. -ErrorAction Continue -Recurse -Force | Where {$_.FullName -notlike "*node_modules*"}'
+  displayName: 'Dir workspace except node_modules'
+  continueOnError: true
+  condition: succeededOrFailed()

build/botframework-cli-azure-devops.yml

@@ -0,0 +1,24 @@
+#
+# Build Botframework-CLI Azure DevOps bits on Windows agent
+#
+
+# "name" here defines the build number format. Build number is accessed via $(Build.BuildNumber)
+name: $(Build.BuildId)
+
+pool:
+  name: Hosted Windows 2019 with VS2019
+
+pr: none
+trigger: none
+
+variables:
+- template: botframework-cli-version.yml  # Template reference ${{ variables.releaseVersion }}
+#  version: define this in Azure, settable at queue time
+
+stages:
+- stage: Build
+  jobs:
+  - job:
+    steps:
+    - script: echo '##vso[task.setvariable variable=_version]${{ variables.releaseVersion }}-devops
+    - template: bf-cli-build-test-steps.yml

build/botframework-cli-daily.yml

@@ -18,67 +18,14 @@ schedules:
     include:
     - master
 
-jobs:
-  - job: CLI
-
+variables:
+- template: botframework-cli-version.yml  # Template reference ${{ variables.releaseVersion }}
+#  version: define this in Azure, settable at queue time
+
+stages:
+- stage: Build
+  jobs:
+  - job:
     steps:
-    - bash: |
-        short_hash=`git rev-parse --short=7 HEAD`  ## At least 7 digits, more if needed for uniqueness
-        echo "Full git hash:  $(Build.SourceVersion)"
-        echo "Short git hash: $short_hash"
-        echo "##vso[task.setvariable variable=short_hash]$short_hash"  ## Store variable for subsequent steps
-      workingDirectory: $(Build.SourcesDirectory)
-      displayName: Set Build Version
-
-    - powershell: |
-        $date = (Get-Date).ToString("yyyyMMdd")
-        echo "##vso[task.setvariable variable=buildDate]$date"  ## Store variable for subsequent steps
-
-    - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
-      displayName: 'Tag Build with version number'
-      inputs:
-        tags: 'Version=4.10.0-dev.$(buildDate).$(short_hash)'
-      continueOnError: true
-
-    - task: NodeTool@0
-      displayName: 'Use Node 12.x'
-      inputs:
-        versionSpec: 12.x
-
-    - task: Npm@1
-      displayName: 'npm install --global @microsoft/rush'
-      inputs:
-        command: custom
-        verbose: false
-        customCommand: 'install --global @microsoft/rush'
-
-    - script: 'rush update'
-      displayName: 'rush update'
-
-    - script: 'rush build -p 2'
-      displayName: 'rush build -p 2'
-
-    - script: 'rush test'
-      displayName: 'rush test'
-
-    - script: 'node ./common/scripts/version-and-pack.js --version 4.10.0-dev.$(buildDate).$(short_hash)'
-      displayName: 'Version and Pack'
-
-    - task: CopyFiles@2
-      displayName: 'Copy packages to: $(Build.ArtifactStagingDirectory)/drop'
-      inputs:
-        SourceFolder: ./.output
-        Contents: '**/*.tgz'
-        TargetFolder: '$(Build.ArtifactStagingDirectory)/drop'
-        flattenFolders: true
-
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: drop'
-      inputs:
-        PathtoPublish: '$(Build.ArtifactStagingDirectory)/drop'
-        ArtifactName: drop
-
-    - powershell: 'Get-ChildItem .. -ErrorAction Continue -Recurse -Force | Where {$_.FullName -notlike "*node_modules*"}'
-      displayName: 'Dir workspace except node_modules'
-      continueOnError: true
-      condition: succeededOrFailed()
+    - script: echo '##vso[task.setvariable variable=_version]${{ variables.releaseVersion }}-dev
+    - template: bf-cli-build-test-steps.yml

build/botframework-cli-mac.yml

@@ -25,63 +25,13 @@ pr:
       - LICENSE
       - PRIVACY.md
 
-jobs:
-  - job: CLI
-    variables:
-      buildVersion: '4.10.0-preview.$(Build.BuildId)'
-      _version: ${{coalesce(variables.version, variables.buildVersion)}}
-
+variables:
+  version: '1.0.0'
+#  version: define this in Azure, settable at queue time
+
+stages:
+- stage: Build
+  jobs:
+  - job:
     steps:
-    - task: colinsalmcorner.colinsalmcorner-buildtasks.tag-build-task.tagBuildOrRelease@0
-      displayName: 'Tag Build with version number'
-      inputs:
-        tags: 'Version=$(_version)'
-      continueOnError: true
-      condition: and(succeeded(), eq(variables['System.PullRequest.IsFork'], 'False'))
-
-    - task: NodeTool@0
-      displayName: 'Use Node 12.x'
-      inputs:
-        versionSpec: 12.x
-
-    - task: Npm@1
-      displayName: 'Install rush'
-      inputs:
-        command: custom
-        verbose: false
-        customCommand: 'install --global @microsoft/rush'
-
-    - script: 'rush update'
-      displayName: 'rush update'
-
-    - script: 'rush build'
-      displayName: 'rush build'
-
-    - script: 'rush test -v'
-      displayName: 'rush test'
-
-    - script: 'rush posttest'
-      displayName: 'rush posttest'
-
-    - script: 'node ./common/scripts/version-and-pack.js --version $(_version)'
-      displayName: 'Version and Pack'
-
-    - task: CopyFiles@2
-      displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)'
-      inputs:
-        SourceFolder: ./.output
-        Contents: '**/*.tgz'
-        TargetFolder: '$(Build.ArtifactStagingDirectory)'
-        flattenFolders: true
-
-    - task: PublishBuildArtifacts@1
-      displayName: 'Publish Artifact: drop'
-      inputs:
-        artifactName: 'drop'
-
-    - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
-      displayName: 'Component Detection'
-
-    - script: 'rush report:coverage'
-      displayName: 'rush report:coverage'
-      enabled: false
+    - template: bf-cli-build-test-steps.yml

build/botframework-cli-rc.yml

@@ -0,0 +1,24 @@
+#
+# Build Botframework-CLI RC bits on Windows agent
+#
+
+# "name" here defines the build number format. Build number is accessed via $(Build.BuildNumber)
+name: $(Build.BuildId)
+
+pool:
+  name: Hosted Windows 2019 with VS2019
+
+pr: none
+trigger: none
+
+variables:
+- template: botframework-cli-version.yml  # Template reference ${{ variables.releaseVersion }}
+#  version: define this in Azure, settable at queue time
+
+stages:
+- stage: Build
+  jobs:
+  - job:
+    steps:
+    - script: echo '##vso[task.setvariable variable=_version]${{ variables.releaseVersion }}-rc
+    - template: bf-cli-build-test-steps.yml

build/botframework-cli-version.yml

@@ -0,0 +1,2 @@
+variables:
+  releaseVersion: '4.10.0'