From 8a1aac216820657b4820dc8449bae219d946a486 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 6 Oct 2023 13:48:16 -0700 Subject: [PATCH 1/4] Update npm-packaging-pipeline.yml --- .../npm-packaging-pipeline.yml | 41 ++++++------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 2e7ac9508a41e..27a0896956193 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -9,10 +9,14 @@ parameters: - 'custom' default: 'nightly (@dev)' -- name: NodePipelineId - displayName: 'Node npm package build Id' - type: string - default: 'latest' + +resources: + pipelines: + - pipeline: build + source: 'Zip-Nuget-Java-Nodejs Packaging Pipeline' + trigger: true + branch: main + variables: # pipeline should define the following varaibles @@ -65,31 +69,10 @@ stages: runCodesignValidationInjection: false timeoutInMinutes: 10 steps: - - - ${{ if eq(parameters.NodePipelineId, 'latest') }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'specific' - project: '530acbc4-21bc-487d-8cd8-348ff451d2ff' - definition: '940' - specificBuildWithTriggering: true - buildVersionToDownload: 'latestFromBranch' - branchName: 'refs/heads/main' - artifactName: 'NPM_packages' - targetPath: '$(Pipeline.Workspace)' - displayName: 'Download onnxruntime-node Pipeline Artifact' - - - ${{ if ne(parameters.NodePipelineId, 'latest') }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: 'specific' - project: '530acbc4-21bc-487d-8cd8-348ff451d2ff' - definition: '940' - buildVersionToDownload: 'specific' - pipelineId: '${{ parameters.NodePipelineId }}' - artifactName: 'NPM_packages' - targetPath: '$(Pipeline.Workspace)' - displayName: 'Download onnxruntime-node Pipeline Artifact' + - download: build + artifact: 'NPM_packages' + targetPath: '$(Pipeline.Workspace)' + displayName: 'Download onnxruntime-node Pipeline Artifact' - task: CopyFiles@2 inputs: From 7d3ff079a5c7f165d5c3d8d3c13e1e0c1cc8b31c Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 6 Oct 2023 13:49:03 -0700 Subject: [PATCH 2/4] Update npm-packaging-pipeline.yml --- .../azure-pipelines/npm-packaging-pipeline.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 27a0896956193..030e5bd281404 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -9,15 +9,6 @@ parameters: - 'custom' default: 'nightly (@dev)' - -resources: - pipelines: - - pipeline: build - source: 'Zip-Nuget-Java-Nodejs Packaging Pipeline' - trigger: true - branch: main - - variables: # pipeline should define the following varaibles # ExtraBuildArgs @@ -33,6 +24,11 @@ variables: NpmPackagingMode: '$(VersionSuffix)' resources: + pipelines: + - pipeline: build + source: 'Zip-Nuget-Java-Nodejs Packaging Pipeline' + trigger: true + branch: main repositories: - repository: manylinux type: Github From 32ed05e47922dcdf35a5b261bdc45aef9977864e Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Fri, 6 Oct 2023 13:50:31 -0700 Subject: [PATCH 3/4] Update npm-packaging-pipeline.yml --- .../ci_build/github/azure-pipelines/npm-packaging-pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 030e5bd281404..863aa57aeb135 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -67,12 +67,11 @@ stages: steps: - download: build artifact: 'NPM_packages' - targetPath: '$(Pipeline.Workspace)' displayName: 'Download onnxruntime-node Pipeline Artifact' - task: CopyFiles@2 inputs: - sourceFolder: $(Pipeline.Workspace) + sourceFolder: '$(Pipeline.Workspace)\NPM_packages' contents: onnxruntime-*.tgz targetFolder: $(Build.ArtifactStagingDirectory)\node-artifacts displayName: 'Copy onnxruntime-node Artifacts' From 7514a0db01d8f392a86ea7ba9c4f53a2a6b6d200 Mon Sep 17 00:00:00 2001 From: Changming Sun Date: Sat, 7 Oct 2023 09:07:54 -0700 Subject: [PATCH 4/4] Update npm-packaging-pipeline.yml for Azure Pipelines --- .../ci_build/github/azure-pipelines/npm-packaging-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml index 863aa57aeb135..588b5d049ee3c 100644 --- a/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/npm-packaging-pipeline.yml @@ -71,7 +71,7 @@ stages: - task: CopyFiles@2 inputs: - sourceFolder: '$(Pipeline.Workspace)\NPM_packages' + sourceFolder: '$(Pipeline.Workspace)\build\NPM_packages' contents: onnxruntime-*.tgz targetFolder: $(Build.ArtifactStagingDirectory)\node-artifacts displayName: 'Copy onnxruntime-node Artifacts'