From 5fdb5cb5f119e5d100ac3798b7a55c6bdb2958cd Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Tue, 7 Jul 2020 20:21:04 -0700 Subject: [PATCH 1/7] getting that private package out of dev feed --- eng/tools/versioning/set-dev.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/tools/versioning/set-dev.js b/eng/tools/versioning/set-dev.js index 57c4a3e50047..7aab58aa8fd8 100644 --- a/eng/tools/versioning/set-dev.js +++ b/eng/tools/versioning/set-dev.js @@ -179,7 +179,8 @@ async function main(argv) { for (const package of Object.keys(rushPackages)) { if ( ["client", "core"].includes(rushPackages[package].versionPolicy) && - rushPackages[package].projectFolder.startsWith(`sdk/${service}`) + rushPackages[package].projectFolder.startsWith(`sdk/${service}`) && + !rushPackages[package].json["private"] ) { targetPackages.push(package); } From 296c7d280f5ff4381197d6404a6ce7240c09e902 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Tue, 7 Jul 2020 22:02:59 -0700 Subject: [PATCH 2/7] unsure about this pipeline change --- eng/pipelines/templates/stages/archetype-js-release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/archetype-js-release.yml b/eng/pipelines/templates/stages/archetype-js-release.yml index 72577e33f67e..64ad7de4a3da 100644 --- a/eng/pipelines/templates/stages/archetype-js-release.yml +++ b/eng/pipelines/templates/stages/archetype-js-release.yml @@ -189,7 +189,7 @@ stages: dependsOn: ${{parameters.DependsOn}} jobs: - job: PublishPackages - condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'))) + condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'),ne(variables['Skip.PublishDevFeed'], 'true'))) displayName: Publish package to daily feed pool: vmImage: ubuntu-18.04 @@ -199,6 +199,7 @@ stages: artifact: ${{parameters.ArtifactName}} timeoutInMinutes: 5 - ${{ each artifact in parameters.Artifacts }}: + - ${{if ne(artifact.options.skipPublishDevFeed, 'true')}}: - pwsh: | $detectedPackageName=Get-ChildItem $(Pipeline.Workspace)/${{parameters.ArtifactName}}/${{artifact.name}}-*-dev*.tgz echo "##vso[task.setvariable variable=Package.Archive]$detectedPackageName" From 16dc86ced936aec4c47f42ee042b27f5f51cdc76 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 8 Jul 2020 15:11:23 -0700 Subject: [PATCH 3/7] test template --- sdk/template/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml index 0e8c7b11bb87..6ad4eb63be8e 100644 --- a/sdk/template/ci.yml +++ b/sdk/template/ci.yml @@ -29,3 +29,4 @@ extends: Artifacts: - name: azure-template safeName: azuretemplate + skipPublishDevFeed: true From b944ca98907ebadbde7888a9954ed117863d43e6 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 8 Jul 2020 15:41:18 -0700 Subject: [PATCH 4/7] test template --- eng/pipelines/templates/stages/archetype-js-release.yml | 2 +- sdk/template/ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/templates/stages/archetype-js-release.yml b/eng/pipelines/templates/stages/archetype-js-release.yml index 64ad7de4a3da..57dc4ee32030 100644 --- a/eng/pipelines/templates/stages/archetype-js-release.yml +++ b/eng/pipelines/templates/stages/archetype-js-release.yml @@ -189,7 +189,7 @@ stages: dependsOn: ${{parameters.DependsOn}} jobs: - job: PublishPackages - condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'),ne(variables['Skip.PublishDevFeed'], 'true'))) + condition: or(eq(variables['SetDevVersion'], 'true'), and(eq(variables['Build.Reason'],'Schedule'), eq(variables['System.TeamProject'], 'internal'))) displayName: Publish package to daily feed pool: vmImage: ubuntu-18.04 diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml index 6ad4eb63be8e..4c8df767c0a8 100644 --- a/sdk/template/ci.yml +++ b/sdk/template/ci.yml @@ -29,4 +29,5 @@ extends: Artifacts: - name: azure-template safeName: azuretemplate - skipPublishDevFeed: true + options: + skipPublishDevFeed: true From fea4cbf8c8f3df11090ef7d2324d3e48dd78d83d Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 8 Jul 2020 16:56:19 -0700 Subject: [PATCH 5/7] remove the options from template --- sdk/template/ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/sdk/template/ci.yml b/sdk/template/ci.yml index 4c8df767c0a8..0e8c7b11bb87 100644 --- a/sdk/template/ci.yml +++ b/sdk/template/ci.yml @@ -29,5 +29,3 @@ extends: Artifacts: - name: azure-template safeName: azuretemplate - options: - skipPublishDevFeed: true From 9d7a099be3fdf58d1e466b7df993ca27cca24c07 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Wed, 8 Jul 2020 17:31:33 -0700 Subject: [PATCH 6/7] add config to tables --- sdk/tables/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/tables/ci.yml b/sdk/tables/ci.yml index 3f68d48e5c7a..ae2bbf399dd9 100644 --- a/sdk/tables/ci.yml +++ b/sdk/tables/ci.yml @@ -30,3 +30,5 @@ extends: Artifacts: - name: azure-tables safeName: azuretables + options: +          skipPublishDevFeed: true From d4c231e2ea26737b18e10f581ab18b0b659bc4c4 Mon Sep 17 00:00:00 2001 From: Karishma Ghiya Date: Thu, 9 Jul 2020 18:16:13 -0700 Subject: [PATCH 7/7] indentation --- sdk/tables/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tables/ci.yml b/sdk/tables/ci.yml index ae2bbf399dd9..2e0686e0eb69 100644 --- a/sdk/tables/ci.yml +++ b/sdk/tables/ci.yml @@ -31,4 +31,4 @@ extends: - name: azure-tables safeName: azuretables options: -          skipPublishDevFeed: true + skipPublishDevFeed: true