Skip to content

Fix publish SBOM manifest with nuget package and changing Win to Linux for release pipeline #960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrdmr merged 4 commits into from
Feb 17, 2022
Merged

Fix publish SBOM manifest with nuget package and changing Win to Linux for release pipeline #960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ee84f1
test fix for nuget command failure for path not found
arroyc Feb 1, 2022
acb5b2f
update packageworker step to linux agent
arroyc Feb 9, 2022
b469f88
remove commented code and debug code
arroyc Feb 14, 2022
c785dc8
add comments in packageworker job
arroyc Feb 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ jobs:
# vmImage: 'vs2017-win2016'
name: '1ES-Hosted-AzFunc' # MMS2019TLS for Windows2019 or MMSUbuntu20.04TLS for ubuntu
demands:
- ImageOverride -equals MMS2019TLS
- ImageOverride -equals MMSUbuntu20.04TLS
steps:
- bash: |
echo "Releasing from $BUILD_SOURCEBRANCHNAME"
Expand All @@ -223,6 +223,12 @@ jobs:
NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
WKVERSION="$VERSION-$(patchBuildNumberForDev)"
else
# this is only to test nuget related workflow because we are setting nuspec here
echo "Generating Integration Test Package for $BUILD_SOURCEBRANCHNAME for testing purpose"
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-$(BUILD_BUILDID)-TEST"
echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"
fi

Expand All @@ -237,8 +243,8 @@ jobs:
- task: ManifestGeneratorTask@0
displayName: 'SBOM Generation Task'
inputs:
BuildDropPath: '$(Build.ArtifactStagingDirectory)'
BuildComponentPath: '$(Build.ArtifactStagingDirectory)'
BuildDropPath: '$(Build.SourcesDirectory)'
BuildComponentPath: '$(Build.SourcesDirectory)'
Verbosity: 'Verbose'
- task: NuGetCommand@2
inputs:
Expand Down
4 changes: 2 additions & 2 deletions pack/Microsoft.Azure.Functions.V2.PythonWorker.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<file src="..\3.7_OSX_X64\**" target="tools\3.7\OSX\X64" />
<file src="..\python\prodV2\worker.config.json" target="tools" />
<file src="Microsoft.Azure.Functions.PythonWorker.targets" target="build" />
<file src="..\PythonWorker\_manifest\manifest.json" target="SBOM\manifest.json" />
<file src="..\PythonWorker\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />
<file src="..\_manifest\manifest.json" target="SBOM\manifest.json" />
<file src="..\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />
</files>
</package>
4 changes: 2 additions & 2 deletions pack/Microsoft.Azure.Functions.V3.PythonWorker.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<file src="..\3.9_OSX_X64\**" target="tools\3.9\OSX\X64" />
<file src="..\python\prodV3\worker.config.json" target="tools" />
<file src="Microsoft.Azure.Functions.PythonWorker.targets" target="build" />
<file src="..\PythonWorker\_manifest\manifest.json" target="SBOM\manifest.json" />
<file src="..\PythonWorker\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />
<file src="..\_manifest\manifest.json" target="SBOM\manifest.json" />
<file src="..\_manifest\spdx_2.2\manifest.spdx.json" target="SBOM\manifest.spdx.json" />
</files>
</package>