Upgrade windows & mac agents per AzDO removing older support (#945)

* Upgrade windows & mac agents per AzDO removing older support

* fix service connection issues
* disable server deploy
Esse commit está contido em:
My
2020-03-25 11:53:05 -07:00
commit de GitHub
commit a19d2b7688
5 arquivos alterados com 19 adições e 19 exclusões
+2 -2
Ver Arquivo
@@ -17,7 +17,7 @@ jobs:
- job: MacOS - job: MacOS
pool: pool:
vmImage: macOS-10.13 vmImage: macOS-10.15
timeoutInMinutes: 60 # how long to run the job before automatically cancelling timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps: steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found - checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -26,7 +26,7 @@ jobs:
- job: Windows - job: Windows
pool: pool:
vmImage: win1803 vmImage: "windows-2019"
timeoutInMinutes: 60 # how long to run the job before automatically cancelling timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps: steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found - checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -51,7 +51,7 @@ steps:
- task: AzureCLI@1 - task: AzureCLI@1
displayName: "Pull down old report and add updates" displayName: "Pull down old report and add updates"
inputs: inputs:
azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)' azureSubscription: 'pj-little-sub'
scriptLocation: inlineScript scriptLocation: inlineScript
inlineScript: './scripts/update-report.sh' inlineScript: './scripts/update-report.sh'
+3 -3
Ver Arquivo
@@ -13,7 +13,7 @@ stages:
cancelTimeoutInMinutes: 1 # time limit to wait for job to cancel cancelTimeoutInMinutes: 1 # time limit to wait for job to cancel
pool: pool:
vmImage: macOS-10.13 # ssh key was generated on a Mac so using the same type of OS here vmImage: macOS-10.15 # ssh key was generated on a Mac so using the same type of OS here
steps: steps:
- task: NodeTool@0 - task: NodeTool@0
@@ -63,7 +63,7 @@ stages:
parameters: parameters:
name: Windows name: Windows
pool: pool:
vmImage: vs2017-win2016 vmImage: "windows-2019"
os: windows os: windows
artifact: vott*.exe artifact: vott*.exe
@@ -71,7 +71,7 @@ stages:
parameters: parameters:
name: MacOS name: MacOS
pool: pool:
vmImage: macOS-10.13 vmImage: macOS-10.15
os: mac os: mac
artifact: vott*.dmg artifact: vott*.dmg
+2 -2
Ver Arquivo
@@ -16,7 +16,7 @@ jobs:
- job: MacOS - job: MacOS
condition: succeeded() condition: succeeded()
pool: pool:
vmImage: macOS-10.13 vmImage: macOS-10.15
timeoutInMinutes: 60 # how long to run the job before automatically cancelling timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps: steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found - checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -26,7 +26,7 @@ jobs:
- job: Windows - job: Windows
condition: succeeded() condition: succeeded()
pool: pool:
vmImage: vs2017-win2016 vmImage: "windows-2019"
timeoutInMinutes: 60 # how long to run the job before automatically cancelling timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps: steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found - checkout: self # self represents the repo where the initial Pipelines YAML file was found
+11 -11
Ver Arquivo
@@ -3,13 +3,13 @@
# Add steps that analyze code, save build artifacts, deploy, and more: # Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
trigger: trigger: none
- johnshew/login pr: none
variables: variables:
# Azure Resource Manager connection created during pipeline creation # Azure Resource Manager connection created during pipeline creation
azureSubscription: 'fe7b93fe-e836-4a55-804c-883dbea6af24' azureSubscription: fe7b93fe-e836-4a55-804c-883dbea6af24'
# Web app name # Web app name
webAppName: 'vott' webAppName: 'vott'
@@ -19,25 +19,25 @@ variables:
stages: stages:
- stage: Build - stage: Build
displayName: Build stage displayName: Build stage
jobs: jobs:
- job: Build - job: Build
displayName: Build displayName: Build
pool: pool:
vmImage: $(vmImageName) vmImage: $(vmImageName)
steps: steps:
- task: NodeTool@0 - task: NodeTool@0
inputs: inputs:
versionSpec: '10.x' versionSpec: '10.x'
displayName: 'Install Node.js' displayName: 'Install Node.js'
- script: | - script: |
npm install npm install
npm run build --if-present npm run build --if-present
# npm run test --if-present # npm run test --if-present
workingDirectory: $(System.DefaultWorkingDirectory)/server workingDirectory: $(System.DefaultWorkingDirectory)/server
displayName: 'npm install, build and test' displayName: 'npm install, build and test'
- task: ArchiveFiles@2 - task: ArchiveFiles@2
displayName: 'Archive files' displayName: 'Archive files'
inputs: inputs:
@@ -58,12 +58,12 @@ stages:
- deployment: Deploy - deployment: Deploy
displayName: Deploy displayName: Deploy
environment: 'development' environment: 'development'
pool: pool:
vmImage: $(vmImageName) vmImage: $(vmImageName)
strategy: strategy:
runOnce: runOnce:
deploy: deploy:
steps: steps:
- task: AzureWebApp@1 - task: AzureWebApp@1
displayName: 'Azure Web App Deploy: vott' displayName: 'Azure Web App Deploy: vott'
inputs: inputs:
@@ -72,4 +72,4 @@ stages:
appName: $(webAppName) appName: $(webAppName)
runtimeStack: 'NODE|10.10' runtimeStack: 'NODE|10.10'
package: $(Pipeline.Workspace)/drop/$(Build.BuildId).zip package: $(Pipeline.Workspace)/drop/$(Build.BuildId).zip
startUpCommand: 'npm run start' startUpCommand: 'npm run start'