Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

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

Merged
merged 4 commits into from
Mar 25, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- job: MacOS
pool:
vmImage: macOS-10.13
vmImage: macOS-10.15
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
Expand All @@ -26,7 +26,7 @@ jobs:

- job: Windows
pool:
vmImage: win1803
vmImage: "windows-2019"
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/plato/generate-up-to-date-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ steps:
- task: AzureCLI@1
displayName: "Pull down old report and add updates"
inputs:
azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)'
azureSubscription: 'pj-little-sub'
mydiemho marked this conversation as resolved.
Show resolved Hide resolved
scriptLocation: inlineScript
inlineScript: './scripts/update-report.sh'

Expand Down
6 changes: 3 additions & 3 deletions preview-release-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ stages:
cancelTimeoutInMinutes: 1 # time limit to wait for job to cancel

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:
- task: NodeTool@0
Expand Down Expand Up @@ -63,15 +63,15 @@ stages:
parameters:
name: Windows
pool:
vmImage: vs2017-win2016
vmImage: "windows-2019"
os: windows
artifact: vott*.exe

- template: azure-pipelines/templates/build-artifact.yml
parameters:
name: MacOS
pool:
vmImage: macOS-10.13
vmImage: macOS-10.15
os: mac
artifact: vott*.dmg

Expand Down
4 changes: 2 additions & 2 deletions release-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- job: MacOS
condition: succeeded()
pool:
vmImage: macOS-10.13
vmImage: macOS-10.15
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
Expand All @@ -26,7 +26,7 @@ jobs:
- job: Windows
condition: succeeded()
pool:
vmImage: vs2017-win2016
vmImage: "windows-2019"
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
steps:
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
Expand Down
22 changes: 11 additions & 11 deletions server/azure-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# Add steps that analyze code, save build artifacts, deploy, and more:
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript

trigger:
- johnshew/login
trigger: none
pr: none

variables:
# Azure Resource Manager connection created during pipeline creation
azureSubscription: 'fe7b93fe-e836-4a55-804c-883dbea6af24'
azureSubscription: fe7b93fe-e836-4a55-804c-883dbea6af24'

# Web app name
webAppName: 'vott'

Expand All @@ -19,25 +19,25 @@ variables:
stages:
- stage: Build
displayName: Build stage
jobs:
jobs:
- job: Build
displayName: Build
pool:
vmImage: $(vmImageName)

steps:
- task: NodeTool@0
inputs:
versionSpec: '10.x'
displayName: 'Install Node.js'

- script: |
- script: |
npm install
npm run build --if-present
# npm run test --if-present
workingDirectory: $(System.DefaultWorkingDirectory)/server
displayName: 'npm install, build and test'

- task: ArchiveFiles@2
displayName: 'Archive files'
inputs:
Expand All @@ -58,12 +58,12 @@ stages:
- deployment: Deploy
displayName: Deploy
environment: 'development'
pool:
pool:
vmImage: $(vmImageName)
strategy:
runOnce:
deploy:
steps:
steps:
- task: AzureWebApp@1
displayName: 'Azure Web App Deploy: vott'
inputs:
Expand All @@ -72,4 +72,4 @@ stages:
appName: $(webAppName)
runtimeStack: 'NODE|10.10'
package: $(Pipeline.Workspace)/drop/$(Build.BuildId).zip
startUpCommand: 'npm run start'
startUpCommand: 'npm run start'