Skip to content

Commit 3446f7f

Browse files
joaomorenojoaomoreno
committed
Revert "fix PR builds"
This reverts commit 788301d.
1 parent 71858cf commit 3446f7f

3 files changed

Lines changed: 12 additions & 15 deletions

File tree

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,24 @@ 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"
85
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
96
inputs:
107
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
118
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
129
vstsFeed: '$(ArtifactFeed)'
13-
condition: eq(variables['System.PullRequest.PullRequestId'], '')
10+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
11+
inputs:
12+
versionSpec: "1.10.1"
1413
- script: |
1514
yarn
1615
displayName: Install Dependencies
17-
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
16+
condition: ne(variables['CacheRestored'], 'true')
1817
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
1918
inputs:
2019
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2120
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2221
vstsFeed: '$(ArtifactFeed)'
23-
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
22+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2423
- script: |
2524
yarn gulp electron-x64
2625
displayName: Download Electron

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,24 @@ 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"
1613
- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1
1714
inputs:
1815
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
1916
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2017
vstsFeed: '$(ArtifactFeed)'
21-
condition: eq(variables['System.PullRequest.PullRequestId'], '')
18+
- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
19+
inputs:
20+
versionSpec: "1.10.1"
2221
- script: |
2322
yarn
2423
displayName: Install Dependencies
25-
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
24+
condition: ne(variables['CacheRestored'], 'true')
2625
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2726
inputs:
2827
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2928
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
3029
vstsFeed: '$(ArtifactFeed)'
31-
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
30+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
3231
- script: |
3332
yarn gulp electron-x64
3433
displayName: Download Electron

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,16 @@ 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'], '')
1817
- powershell: |
1918
yarn
2019
displayName: Install Dependencies
21-
condition: or(ne(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
20+
condition: ne(variables['CacheRestored'], 'true')
2221
- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1
2322
inputs:
2423
keyfile: '**/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock'
2524
targetfolder: '**/node_modules, !**/node_modules/**/node_modules'
2625
vstsFeed: '$(ArtifactFeed)'
27-
condition: and(succeeded(), eq(variables['System.PullRequest.PullRequestId'], ''), ne(variables['CacheRestored'], 'true'))
26+
condition: and(succeeded(), ne(variables['CacheRestored'], 'true'))
2827
- powershell: |
2928
yarn gulp electron
3029
displayName: Download Electron

0 commit comments

Comments
 (0)