Skip to content

Commit a19d2b7

Browse files
authored
Upgrade windows & mac agents per AzDO removing older support (microsoft#945)
* Upgrade windows & mac agents per AzDO removing older support * fix service connection issues * disable server deploy
1 parent ed2d28f commit a19d2b7

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

azure-pipelines.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

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

2727
- job: Windows
2828
pool:
29-
vmImage: win1803
29+
vmImage: "windows-2019"
3030
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
3131
steps:
3232
- checkout: self # self represents the repo where the initial Pipelines YAML file was found

azure-pipelines/plato/generate-up-to-date-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ steps:
5151
- task: AzureCLI@1
5252
displayName: "Pull down old report and add updates"
5353
inputs:
54-
azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)'
54+
azureSubscription: 'pj-little-sub'
5555
scriptLocation: inlineScript
5656
inlineScript: './scripts/update-report.sh'
5757

preview-release-pipeline.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313
cancelTimeoutInMinutes: 1 # time limit to wait for job to cancel
1414

1515
pool:
16-
vmImage: macOS-10.13 # ssh key was generated on a Mac so using the same type of OS here
16+
vmImage: macOS-10.15 # ssh key was generated on a Mac so using the same type of OS here
1717

1818
steps:
1919
- task: NodeTool@0
@@ -63,15 +63,15 @@ stages:
6363
parameters:
6464
name: Windows
6565
pool:
66-
vmImage: vs2017-win2016
66+
vmImage: "windows-2019"
6767
os: windows
6868
artifact: vott*.exe
6969

7070
- template: azure-pipelines/templates/build-artifact.yml
7171
parameters:
7272
name: MacOS
7373
pool:
74-
vmImage: macOS-10.13
74+
vmImage: macOS-10.15
7575
os: mac
7676
artifact: vott*.dmg
7777

release-pipeline.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- job: MacOS
1717
condition: succeeded()
1818
pool:
19-
vmImage: macOS-10.13
19+
vmImage: macOS-10.15
2020
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
2121
steps:
2222
- checkout: self # self represents the repo where the initial Pipelines YAML file was found
@@ -26,7 +26,7 @@ jobs:
2626
- job: Windows
2727
condition: succeeded()
2828
pool:
29-
vmImage: vs2017-win2016
29+
vmImage: "windows-2019"
3030
timeoutInMinutes: 60 # how long to run the job before automatically cancelling
3131
steps:
3232
- checkout: self # self represents the repo where the initial Pipelines YAML file was found

server/azure-deploy.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
# Add steps that analyze code, save build artifacts, deploy, and more:
44
# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript
55

6-
trigger:
7-
- johnshew/login
6+
trigger: none
7+
pr: none
88

99
variables:
1010
# Azure Resource Manager connection created during pipeline creation
11-
azureSubscription: 'fe7b93fe-e836-4a55-804c-883dbea6af24'
12-
11+
azureSubscription: fe7b93fe-e836-4a55-804c-883dbea6af24'
12+
1313
# Web app name
1414
webAppName: 'vott'
1515

@@ -19,25 +19,25 @@ variables:
1919
stages:
2020
- stage: Build
2121
displayName: Build stage
22-
jobs:
22+
jobs:
2323
- job: Build
2424
displayName: Build
2525
pool:
2626
vmImage: $(vmImageName)
27-
27+
2828
steps:
2929
- task: NodeTool@0
3030
inputs:
3131
versionSpec: '10.x'
3232
displayName: 'Install Node.js'
3333

34-
- script: |
34+
- script: |
3535
npm install
3636
npm run build --if-present
3737
# npm run test --if-present
3838
workingDirectory: $(System.DefaultWorkingDirectory)/server
3939
displayName: 'npm install, build and test'
40-
40+
4141
- task: ArchiveFiles@2
4242
displayName: 'Archive files'
4343
inputs:
@@ -58,12 +58,12 @@ stages:
5858
- deployment: Deploy
5959
displayName: Deploy
6060
environment: 'development'
61-
pool:
61+
pool:
6262
vmImage: $(vmImageName)
6363
strategy:
6464
runOnce:
6565
deploy:
66-
steps:
66+
steps:
6767
- task: AzureWebApp@1
6868
displayName: 'Azure Web App Deploy: vott'
6969
inputs:
@@ -72,4 +72,4 @@ stages:
7272
appName: $(webAppName)
7373
runtimeStack: 'NODE|10.10'
7474
package: $(Pipeline.Workspace)/drop/$(Build.BuildId).zip
75-
startUpCommand: 'npm run start'
75+
startUpCommand: 'npm run start'

0 commit comments

Comments
 (0)