Skip to content
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

Jump to bottom

Update area path and fix build to generate correct SBOM #223

Merged
merged 3 commits into from
Sep 6, 2024
Merged

Update area path and fix build to generate correct SBOM #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47a7ca9
Fix build to generate correct SBOM
daxian-dbw Sep 6, 2024
74978a4
Add `ob_restore_phase` to a few steps
daxian-dbw Sep 6, 2024
2ecf3d7
Update area path for AIShell
daxian-dbw Sep 6, 2024
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
2 changes: 1 addition & 1 deletion .config/tsaoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"instanceUrl": "https://msazure.visualstudio.com",
"projectName": "One",
"areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core",
"areaPath": "One\\MGMT\\Compute\\Powershell\\Powershell\\PowerShell Core\\AIShell",
"notificationAliases": [
"[email protected]",
"[email protected]"
Expand Down
12 changes: 12 additions & 0 deletions .pipelines/templates/linux-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,18 @@ jobs:
env:
ob_restore_phase: true

- template: /.pipelines/templates/update-nuget-config.yml@self
parameters:
repoRoot: $(repoRoot)

- pwsh: |
Import-Module $(repoRoot)/build.psm1 -Force
Install-Dotnet
Start-Build -Configuration Release -Clean -NotIncludeModule -Verbose
displayName: 'Build again to get correct SBOM'
env:
ob_restore_phase: true

- task: DownloadPipelineArtifact@2
inputs:
artifact: drop_linux_build_$(Architecture)
Expand Down
14 changes: 14 additions & 0 deletions .pipelines/templates/mac-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ jobs:
Write-Host "##vso[artifact.upload containerfolder=$artifactName;artifactname=$artifactName]$($result.App)"
}
displayName: 'Build macOS'
env:
ob_restore_phase: true

- template: /.pipelines/templates/finalize.yml@self

Expand Down Expand Up @@ -109,6 +111,18 @@ jobs:
env:
ob_restore_phase: true

- template: /.pipelines/templates/update-nuget-config.yml@self
parameters:
repoRoot: $(repoRoot)

- pwsh: |
Import-Module $(repoRoot)/build.psm1 -Force
Install-Dotnet
Start-Build -Configuration Release -Clean -NotIncludeModule -Verbose
displayName: 'Build again to get correct SBOM'
env:
ob_restore_phase: true

- task: DownloadPipelineArtifact@2
inputs:
artifact: 'macBuild-$(Architecture)'
Expand Down
12 changes: 12 additions & 0 deletions .pipelines/templates/module-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@ jobs:
env:
ob_restore_phase: true

- template: /.pipelines/templates/update-nuget-config.yml@self
parameters:
repoRoot: $(repoRoot)

- pwsh: |
Import-Module $(repoRoot)\build.psm1 -Force
Install-Dotnet
dotnet restore '$(repoRoot)\shell\AIShell.Integration'
displayName: 'Restore to get correct SBOM'
env:
ob_restore_phase: true

- task: DownloadPipelineArtifact@2
inputs:
artifact: drop_module_build
Expand Down
Loading