From 2494383dbe6cee1bd65cd248b1929f88852d7db9 Mon Sep 17 00:00:00 2001 From: Arjun Roy Chaudhuri Date: Wed, 1 Dec 2021 20:44:05 -0800 Subject: [PATCH 1/3] remove copy file task --- azure-pipelines.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9e5958f19..1241dcb6c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -204,14 +204,9 @@ jobs: - task: ManifestGeneratorTask@0 displayName: 'SBOM Generation Task' inputs: - BuildDropPath: '$(Build.SourcesDirectory)' - BuildComponentPath: '$(Build.SourcesDirectory)' + BuildDropPath: '$(Build.ArtifactStagingDirectory)' + BuildComponentPath: '$(Build.ArtifactStagingDirectory)' Verbosity: 'Verbose' - - task: CopyFiles@2 - inputs: - SourceFolder: '$(Build.SourcesDirectory)\_manifest' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)' - task: NuGetCommand@2 inputs: command: pack From 7a18a0f6cbb38eeaebef78b5e5a02274c51f36bd Mon Sep 17 00:00:00 2001 From: Arjun Roy Chaudhuri Date: Wed, 1 Dec 2021 21:16:50 -0800 Subject: [PATCH 2/3] add debug lines --- azure-pipelines.yml | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1241dcb6c..f175d76c1 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -164,7 +164,7 @@ jobs: - job: PackageWorkers dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64'] - condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) + #condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) pool: vmImage: 'vs2017-win2016' steps: @@ -191,6 +191,10 @@ jobs: WKVERSION="3.$LATEST_TAG-$(patchBuildNumberForDev)" else echo "No Matching Release Tag For $BUILD_SOURCEBRANCH" + LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' | cut -d'.' -f-2) + NUSPEC="pack\Microsoft.Azure.Functions.V3.PythonWorker.nuspec" + # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev) + WKVERSION="3.$LATEST_TAG-$(patchBuildNumberForDev)" fi echo "##vso[task.setvariable variable=nuspec_path]$NUSPEC" @@ -217,12 +221,12 @@ jobs: inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' artifactName: 'PythonWorker' - - task: NuGetCommand@2 - condition: eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], true) - inputs: - command: 'push' - packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' - nuGetFeedType: 'internal' - publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df' - allowPackageConflicts: true - displayName: '[Integration Test] Push NuGet package to the AzureFunctionsPreRelease feed' \ No newline at end of file + #- task: NuGetCommand@2 + # condition: eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], true) + # inputs: + # command: 'push' + # packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' + # nuGetFeedType: 'internal' + # publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df' + # allowPackageConflicts: true + # displayName: '[Integration Test] Push NuGet package to the AzureFunctionsPreRelease feed' \ No newline at end of file From 5007fe0a6cfd2515a21074b4ef27a81101574d24 Mon Sep 17 00:00:00 2001 From: Arjun Roy Chaudhuri Date: Wed, 1 Dec 2021 21:32:56 -0800 Subject: [PATCH 3/3] revert debug/test tasks --- azure-pipelines.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f175d76c1..1241dcb6c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -164,7 +164,7 @@ jobs: - job: PackageWorkers dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64'] - #condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) + condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev')) pool: vmImage: 'vs2017-win2016' steps: @@ -191,10 +191,6 @@ jobs: WKVERSION="3.$LATEST_TAG-$(patchBuildNumberForDev)" else echo "No Matching Release Tag For $BUILD_SOURCEBRANCH" - LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' | cut -d'.' -f-2) - NUSPEC="pack\Microsoft.Azure.Functions.V3.PythonWorker.nuspec" - # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev) - WKVERSION="3.$LATEST_TAG-$(patchBuildNumberForDev)" fi echo "##vso[task.setvariable variable=nuspec_path]$NUSPEC" @@ -221,12 +217,12 @@ jobs: inputs: pathtoPublish: '$(Build.ArtifactStagingDirectory)' artifactName: 'PythonWorker' - #- task: NuGetCommand@2 - # condition: eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], true) - # inputs: - # command: 'push' - # packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' - # nuGetFeedType: 'internal' - # publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df' - # allowPackageConflicts: true - # displayName: '[Integration Test] Push NuGet package to the AzureFunctionsPreRelease feed' \ No newline at end of file + - task: NuGetCommand@2 + condition: eq(variables['UPLOADPACKAGETOPRERELEASEFEED'], true) + inputs: + command: 'push' + packagesToPush: '$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg' + nuGetFeedType: 'internal' + publishVstsFeed: 'e6a70c92-4128-439f-8012-382fe78d6396/f37f760c-aebd-443e-9714-ce725cd427df' + allowPackageConflicts: true + displayName: '[Integration Test] Push NuGet package to the AzureFunctionsPreRelease feed' \ No newline at end of file