Merge remote-tracking branch 'origin/master' into lens_restructure

# Conflicts:
#	package.json
#	src/main/index.ts
#	src/renderer/api/__test__/parseAPI.test.ts
#	src/renderer/components/chart/bar-chart.tsx
#	src/renderer/components/chart/chart.tsx
#	src/renderer/components/chart/pie-chart.tsx
#	src/renderer/utils/__tests__/arrays.test.ts
#	src/renderer/utils/arrays.ts
#	yarn.lock
This commit is contained in:
Roman committed 2020-06-22 17:09:07 +03:00
commit f4922811cc
38 files changed
+281 -265

No files matched your search

+6 -1
View File
@@ -13,7 +13,6 @@ trigger:
- "*"
jobs:
- job: Windows
condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
pool:
vmImage: windows-2019
strategy:
@@ -34,10 +33,14 @@ jobs:
inputs:
key: yarn | $(Agent.OS) | yarn.lock
path: $(YARN_CACHE_FOLDER)
cacheHitVar: CACHE_RESTORED
displayName: Cache Yarn packages
- script: make deps
displayName: Install dependencies
- script: make integration-win
displayName: Run integration tests
- script: make build
condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
displayName: Build
env:
WIN_CSC_LINK: $(WIN_CSC_LINK)
@@ -53,6 +56,7 @@ jobs:
steps:
- script: CI_BUILD_TAG=`git describe --tags` && echo "##vso[task.setvariable variable=CI_BUILD_TAG]$CI_BUILD_TAG"
displayName: Set the tag name as an environment variable
condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
- task: NodeTool@0
inputs:
versionSpec: $(node_version)
@@ -138,6 +142,7 @@ jobs:
SNAP_LOGIN: $(SNAP_LOGIN)
- script: make build
displayName: Build
condition: "and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))"
env:
GH_TOKEN: $(GH_TOKEN)
- bash: |