From 6283daa0d8b17b5de46aba6323738f1d72f9db62 Mon Sep 17 00:00:00 2001 From: Lauri Nevala Date: Tue, 3 Nov 2020 13:57:42 +0200 Subject: [PATCH] Move npm build and extension build into own build step Signed-off-by: Lauri Nevala --- .azure-pipelines.yml | 12 ++++++++++++ Makefile | 6 +++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 56e5fbe57e..faded22ced 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -37,6 +37,10 @@ jobs: displayName: Cache Yarn packages - script: make install-deps displayName: Install dependencies + - script: make build-npm + displayName: Generate npm package + - script: make build-extensions + displayName: Build bundled extensions - script: make integration-win displayName: Run integration tests - script: make build @@ -74,6 +78,10 @@ jobs: condition: eq(variables.CACHE_RESTORED, 'true') - script: make install-deps displayName: Install dependencies + - script: make build-npm + displayName: Generate npm package + - script: make build-extensions + displayName: Build bundled extensions - script: make test displayName: Run tests - script: make integration-mac @@ -121,6 +129,10 @@ jobs: displayName: Install dependencies - script: make lint displayName: Lint + - script: make build-npm + displayName: Generate npm package + - script: make build-extensions + displayName: Build bundled extensions - script: make test displayName: Run tests - bash: | diff --git a/Makefile b/Makefile index 1092d9acf6..514e64ae49 100644 --- a/Makefile +++ b/Makefile @@ -33,15 +33,15 @@ lint: test: download-bins yarn test -integration-linux: build-npm build-extensions +integration-linux: yarn build:linux yarn integration -integration-mac: build-npm build-extensions +integration-mac: yarn build:mac yarn integration -integration-win: build-npm build-extensions +integration-win: yarn build:win yarn integration