Skip to content

Commit 788301d

Browse files
joaomorenojoaomoreno
committed
fix PR builds
1 parent 6906d7e commit 788301d

3 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎build/azure-pipelines/darwin/continuous-build-darwin.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,25 @@ steps:
22
- task: NodeTool@0
33
inputs:
44
versionSpec: "10.15.1"
5+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
6+
inputs:
7+
versionSpec: "1.10.1"
58
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
69
inputs:
710
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
811
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
912
vstsFeed: '$(ArtifactFeed)'
10-
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
11-
inputs:
12-
versionSpec: "1.10.1"
13+
condition: eq(variables['System.PullRequest.PullRequestId'], '')
1314
- script: |
1415
yarn
1516
displayName: Install Dependencies
16-
condition: ne(variables['CacheRestored'], 'true')
17+
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
1718
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
1819
inputs:
1920
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2021
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2122
vstsFeed: '$(ArtifactFeed)'
22-
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
23+
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
2324
- script: |
2425
yarn gulp electron-x64
2526
displayName: Download Electron

‎build/azure-pipelines/linux/continuous-build-linux.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,25 @@ steps:
1010
- task: NodeTool@0
1111
inputs:
1212
versionSpec: "10.15.1"
13+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
14+
inputs:
15+
versionSpec: "1.10.1"
1316
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1417
inputs:
1518
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1619
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1720
vstsFeed: '$(ArtifactFeed)'
18-
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
19-
inputs:
20-
versionSpec: "1.10.1"
21+
condition: eq(variables['System.PullRequest.PullRequestId'], '')
2122
- script: |
2223
yarn
2324
displayName: Install Dependencies
24-
condition: ne(variables['CacheRestored'], 'true')
25+
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
2526
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2627
inputs:
2728
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2829
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2930
vstsFeed: '$(ArtifactFeed)'
30-
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
31+
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
3132
- script: |
3233
yarn gulp electron-x64
3334
displayName: Download Electron

‎build/azure-pipelines/win32/continuous-build-win32.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@ steps:
1414
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1515
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
1616
vstsFeed: '$(ArtifactFeed)'
17+
condition: eq(variables['System.PullRequest.PullRequestId'], '')
1718
- powershell: |
1819
yarn
1920
displayName: Install Dependencies
20-
condition: ne(variables['CacheRestored'], 'true')
21+
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
2122
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2223
inputs:
2324
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2425
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2526
vstsFeed: '$(ArtifactFeed)'
26-
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
27+
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
2728
- powershell: |
2829
yarn gulp electron
2930
displayName: Download Electron

0 commit comments

Comments
 (0)