From 06e22b2e3c2efb9a38707fc91dfcceff1c7992b5 Mon Sep 17 00:00:00 2001 From: Andrey Ivanov Date: Thu, 7 Jul 2022 17:31:15 +0400 Subject: [PATCH 1/3] Update pipeline --- azure-pipelines-steps-node.yml | 13 +++++ azure-pipelines-steps-test-build.yml | 10 ++++ azure-pipelines.yml | 81 +++++----------------------- 3 files changed, 37 insertions(+), 67 deletions(-) create mode 100644 azure-pipelines-steps-node.yml create mode 100644 azure-pipelines-steps-test-build.yml diff --git a/azure-pipelines-steps-node.yml b/azure-pipelines-steps-node.yml new file mode 100644 index 000000000..78b35f90e --- /dev/null +++ b/azure-pipelines-steps-node.yml @@ -0,0 +1,13 @@ +steps: + # npm install + - task: Npm@1 + displayName: (azure-pipelines-task-lib) npm install + inputs: + command: install + workingDir: node + + # use node 10 + - task: NodeTool@0 + displayName: (azure-pipelines-task-lib) use node 10.23.0 + inputs: + versionSpec: "10.23.0" diff --git a/azure-pipelines-steps-test-build.yml b/azure-pipelines-steps-test-build.yml new file mode 100644 index 000000000..38ca9e3e9 --- /dev/null +++ b/azure-pipelines-steps-test-build.yml @@ -0,0 +1,10 @@ +steps: + # test + - script: node make.js test + workingDirectory: node + displayName: (azure-pipelines-task-lib) node make.js test + + # build + - script: node make.js build + displayName: (azure-pipelines-task-lib) node make.js build + workingDirectory: node diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e6fdc0c03..f8ea16581 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,31 +16,20 @@ jobs: # azure-pipelines-task-lib ################################################################################ - # npm install - - task: Npm@1 - displayName: (azure-pipelines-task-lib) npm install - inputs: - command: install - workingDir: node + - template: azure-pipelines-steps-node.yml - # use node 10 - - task: NodeTool@0 - displayName: (azure-pipelines-task-lib) use node 10.23.0 - inputs: - versionSpec: "10.23.0" - - # build/test + # test - script: | chcp 437 node make.js test workingDirectory: node displayName: (azure-pipelines-task-lib) node make.js test - # build/test + # build - script: | chcp 437 - node make.js test - displayName: (azure-pipelines-task-lib) node make.js test + node make.js build + displayName: (azure-pipelines-task-lib) node make.js build workingDirectory: node ################################################################################ @@ -66,33 +55,15 @@ jobs: pool: vmImage: ubuntu-18.04 - steps: - ################################################################################ - # azure-pipelines-task-lib - ################################################################################ - - # npm install - - task: Npm@1 - displayName: (azure-pipelines-task-lib) npm install - inputs: - command: install - workingDir: node + steps: + - template: azure-pipelines-steps-node.yml + - template: azure-pipelines-steps-test-build.yml - # use node 10 - - task: NodeTool@0 - displayName: (azure-pipelines-task-lib) use node 10.23.0 + - task: PublishPipelineArtifact@1 inputs: - versionSpec: "10.23.0" - - # build/test - - script: node make.js test - workingDirectory: node - displayName: (azure-pipelines-task-lib) node make.js test - - # build/test - - script: node make.js test - displayName: (azure-pipelines-task-lib) node make.js test - workingDirectory: node + targetPath: 'node/_build' + artifactType: 'pipeline' + artifactName: 'npm-package' # For CI runs on master, automatically publish packages - bash: | @@ -113,29 +84,5 @@ jobs: vmImage: macOS-10.15 steps: - ################################################################################ - # azure-pipelines-task-lib - ################################################################################ - - # npm install - - task: Npm@1 - displayName: (azure-pipelines-task-lib) npm install - inputs: - command: install - workingDir: node - - # use node 10 - - task: NodeTool@0 - displayName: (azure-pipelines-task-lib) use node 10.23.0 - inputs: - versionSpec: "10.23.0" - - # build/test - - script: node make.js test - workingDirectory: node - displayName: (azure-pipelines-task-lib) node make.js test - - # build/test - - script: node make.js test - displayName: (azure-pipelines-task-lib) node make.js test - workingDirectory: node + - template: azure-pipelines-steps-node.yml + - template: azure-pipelines-steps-test-build.yml \ No newline at end of file From b78be766c3822fc64ac10b2f3940c6edba1179cf Mon Sep 17 00:00:00 2001 From: AndreyIvanov42 <93121155+AndreyIvanov42@users.noreply.github.com> Date: Fri, 8 Jul 2022 13:00:21 +0400 Subject: [PATCH 2/3] Update azure-pipelines.yml --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f8ea16581..857c2c47f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,4 +85,5 @@ jobs: steps: - template: azure-pipelines-steps-node.yml - - template: azure-pipelines-steps-test-build.yml \ No newline at end of file + - template: azure-pipelines-steps-test-build.yml + From 2b4f25d44b1dd0f256d4badde394e07a330d6f9c Mon Sep 17 00:00:00 2001 From: Andrey Ivanov Date: Fri, 8 Jul 2022 17:56:41 +0400 Subject: [PATCH 3/3] nodeversion as variable --- azure-pipelines-steps-node.yml | 9 ++++++--- azure-pipelines.yml | 9 +++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/azure-pipelines-steps-node.yml b/azure-pipelines-steps-node.yml index 78b35f90e..8e2591383 100644 --- a/azure-pipelines-steps-node.yml +++ b/azure-pipelines-steps-node.yml @@ -1,3 +1,7 @@ +parameters: +- name: nodeVersion + type: string + steps: # npm install - task: Npm@1 @@ -6,8 +10,7 @@ steps: command: install workingDir: node - # use node 10 - task: NodeTool@0 - displayName: (azure-pipelines-task-lib) use node 10.23.0 + displayName: (azure-pipelines-task-lib) use node ${{parameters.nodeVersion}} inputs: - versionSpec: "10.23.0" + versionSpec: ${{parameters.nodeVersion}} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f8ea16581..41786d056 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -3,6 +3,9 @@ trigger: - features/* - releases/* +variables: + nodeVersion: 10.23.0 + jobs: ################################################# - job: windows @@ -17,6 +20,8 @@ jobs: ################################################################################ - template: azure-pipelines-steps-node.yml + parameters: + nodeVersion: $(nodeVersion) # test - script: | @@ -57,6 +62,8 @@ jobs: steps: - template: azure-pipelines-steps-node.yml + parameters: + nodeVersion: $(nodeVersion) - template: azure-pipelines-steps-test-build.yml - task: PublishPipelineArtifact@1 @@ -85,4 +92,6 @@ jobs: steps: - template: azure-pipelines-steps-node.yml + parameters: + nodeVersion: $(nodeVersion) - template: azure-pipelines-steps-test-build.yml \ No newline at end of file