From 14e6b065d9d9a5c6520601013bb7a6cc9fc517db Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Thu, 1 Aug 2019 18:59:12 -0700 Subject: [PATCH 1/3] adding to and from parameters appropriate to action --- .../templates/jobs/archetype-sdk-client.yml | 15 ++++++++------- eng/tools/select-packages/index.js | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index c2553d489ee6..4113303a5217 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -23,10 +23,11 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) displayName: "Build libraries" + - script: | - node common/scripts/install-run-rush.js pack --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js pack --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) displayName: "Pack libraries" - task: CopyFiles@2 @@ -71,7 +72,7 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js lint $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js lint $(GeneratedPackageTargetsFrom) displayName: "Lint libraries" - task: CopyFiles@2 @@ -89,7 +90,7 @@ jobs: path: $(Build.ArtifactStagingDirectory) - script: | - node common/scripts/install-run-rush.js audit $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js audit $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) condition: and(succeeded(), eq(variables['RunNpmAudit'], 'true')) displayName: "Audit libraries" @@ -149,13 +150,13 @@ jobs: displayName: "Install dependencies" - script: | - node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) displayName: "Build test assets" - script: | - node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargets) + node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargetsFrom) displayName: "Test libraries" - task: PublishTestResults@2 diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index d282e3eea11b..25e1d049f716 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -47,7 +47,8 @@ glob(filter, (err, files) => { packageContents["sdk-type"] }".` ); - packageTargets += `--to "${packageContents.name}" `; + packageTargetsTo += `--to "${packageContents.name}" `; + packageTargetsFrom += `--from "${packageContents.name}" `; } else { log( `Package "${ @@ -58,17 +59,26 @@ glob(filter, (err, files) => { } log( - `Finished processing packages. Emitting variable using: ${packageTargets}` + `Finished processing packages. Emitting variable using: ${packageTargetsTo} and ${packageTargetsFrom}` ); // Can't use regular logging here because the pattern for Azure Pipelines requires ##vso to be the first chars. console.log( - `##vso[task.setvariable variable=GeneratedPackageTargets]${packageTargets}` + `##vso[task.setvariable variable=GeneratedPackageTargetsTo]${packageTargetsTo}` ); log( - `Emitted variable "GeneratedPackageTargets" with content: ${packageTargets}` + `Emitted variable "GeneratedPackageTargetsTo" with content: ${packageTargetsTo}` ); + + console.log( + `##vso[task.setvariable variable=GeneratedPackageTargetsFrom]${packageTargetsFrom}` + ); + + log( + `Emitted variable "GeneratedPackageTargetsFrom" with content: ${packageTargetsFrom}` + ); + } else { log("Did not find any packages under service directory."); process.exit(2); From 1bc4f1f27260ae71998d35248406538b315296c6 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Thu, 1 Aug 2019 19:09:01 -0700 Subject: [PATCH 2/3] declare variables --- eng/tools/select-packages/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/tools/select-packages/index.js b/eng/tools/select-packages/index.js index 25e1d049f716..07f7f74ef8d3 100644 --- a/eng/tools/select-packages/index.js +++ b/eng/tools/select-packages/index.js @@ -28,7 +28,8 @@ glob(filter, (err, files) => { process.exit(1); } - let packageTargets = ""; + let packageTargetsTo = ""; + let packageTargetsFrom = ""; if (files) { log(`Found ${files.length} packages under service directory.`); From 79fddecc009f0fdd6770dfdee0ea4ee1f9e0097d Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Fri, 2 Aug 2019 11:46:56 -0700 Subject: [PATCH 3/3] build:test should only need from tag --- eng/pipelines/templates/jobs/archetype-sdk-client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 4113303a5217..0fd75f5fb63b 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -153,7 +153,7 @@ jobs: node common/scripts/install-run-rush.js build --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) displayName: "Build libraries" - script: | - node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargetsTo) $(GeneratedPackageTargetsFrom) + node common/scripts/install-run-rush.js build:test --verbose $(GeneratedPackageTargetsFrom) displayName: "Build test assets" - script: | node common/scripts/install-run-rush.js unit-test --verbose $(GeneratedPackageTargetsFrom)