From e22b56ca8e794f8ee72792d108c369fd49ff7a3f Mon Sep 17 00:00:00 2001 From: nishant Date: Sat, 13 Mar 2021 19:32:22 +0530 Subject: [PATCH 1/3] Update package.json --- app/package.json | 8 ++++---- core/package.json | 2 +- ui/package.json | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/package.json b/app/package.json index 3bf9e0a..7fc2252 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { - "name": "grpc-devtool-app", - "productName": "grpc-devtool-app", - "version": "1.0.0", + "name": "grpc-devtool.app", + "productName": "grpc-devtool.app", + "version": "0.0.10", "description": "GrpcDevtool Gui app.", "main": "src/index.js", "scripts": { @@ -14,7 +14,7 @@ "keywords": [], "author": { "name": "nishant", - "email": "nishant.singh87@gmail.com" + "email": "in.nishants@gmail.com" }, "license": "MIT", "config": { diff --git a/core/package.json b/core/package.json index 5f1ed89..304ec25 100644 --- a/core/package.json +++ b/core/package.json @@ -18,7 +18,7 @@ "scripts": { "test": "jest" }, - "author": "", + "author": "nishants", "license": "MIT", "bin": { "grpc": "./bin/grpc.js" diff --git a/ui/package.json b/ui/package.json index 92be276..f4ddbb4 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,7 +1,7 @@ { - "name": "webpack-starter", - "version": "1.0.0", - "description": "A light foundation for your next frontend project based on webpack.", + "name": "grpc-devtool.ui", + "version": "0.0.10", + "description": "UI for GrpcDevtool", "scripts": { "lint": "npm run lint:styles; npm run lint:scripts", "lint:styles": "stylelint src", @@ -22,7 +22,7 @@ "javascript", "webdev" ], - "author": "webkid.io", + "author": "nishants", "license": "MIT", "bugs": { "url": "https://github.com/wbkd/webpack-starter/issues" From 6e6fa067ae25e34fc83954831a496ea2a7570de3 Mon Sep 17 00:00:00 2001 From: nishant Date: Sat, 13 Mar 2021 19:32:47 +0530 Subject: [PATCH 2/3] Keep single build pipeline. --- ...e-pipelines.app.yml => azure-pipelines.yml | 13 +++++++++- core/azure-pipelines.yml | 25 ------------------- core/build.yml | 15 +++++++++++ 3 files changed, 27 insertions(+), 26 deletions(-) rename azure-pipelines.app.yml => azure-pipelines.yml (78%) delete mode 100644 core/azure-pipelines.yml create mode 100644 core/build.yml diff --git a/azure-pipelines.app.yml b/azure-pipelines.yml similarity index 78% rename from azure-pipelines.app.yml rename to azure-pipelines.yml index 021926b..b13bb10 100644 --- a/azure-pipelines.app.yml +++ b/azure-pipelines.yml @@ -5,6 +5,17 @@ pr: - master stages: + - stage: BuildCore + displayName: "core/build.yml" + jobs: + - job: BuildCore + displayName: "Build grpc-devtool" + timeoutInMinutes: 10 + pool: + vmImage: 'ubuntu-18.04' + steps: + - template: core/build.yml + - stage: BuildUi displayName: "ui/build.yml" jobs: @@ -17,7 +28,7 @@ stages: - template: ui/build.yml - stage: BuildApp - displayName: "ui/build.yml" + displayName: "app/build.yml" dependsOn: "BuildUi" jobs: - job: MacOs diff --git a/core/azure-pipelines.yml b/core/azure-pipelines.yml deleted file mode 100644 index 72170bd..0000000 --- a/core/azure-pipelines.yml +++ /dev/null @@ -1,25 +0,0 @@ -trigger: -- master - -pr: -- master - -pool: - vmImage: 'ubuntu-latest' - -steps: -- task: NodeTool@0 - inputs: - versionSpec: '10.x' - displayName: 'Install Node.js' - -- script: | - cd core - npm install - displayName: 'npm install' - - -- script: | - cd core - npm test - displayName: 'npm test' diff --git a/core/build.yml b/core/build.yml new file mode 100644 index 0000000..18462c2 --- /dev/null +++ b/core/build.yml @@ -0,0 +1,15 @@ +steps: + - task: NodeTool@0 + inputs: + versionSpec: '10.x' + displayName: 'Install Node.js' + + - script: | + cd core + npm install + displayName: 'npm install' + + - script: | + cd core + npm test + displayName: 'npm test' From fc944573d5f965b74cfab1b8b291eec695853a91 Mon Sep 17 00:00:00 2001 From: nishant Date: Sat, 13 Mar 2021 19:37:52 +0530 Subject: [PATCH 3/3] Run ui build in parallel with core build. --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b13bb10..e6baee4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -18,6 +18,7 @@ stages: - stage: BuildUi displayName: "ui/build.yml" + dependsOn: [] # run in parallel with core build jobs: - job: BuilUI displayName: "Webpack build"