Skip to content

Fix various build failures #6039

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
merged 2 commits into from
Mar 5, 2025
Merged

Fix various build failures #6039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f683fb9
Restrict sourceindex only to internal/main
RussKie Mar 5, 2025
7da3c69
Remove duplicate restore/build/publish calls
RussKie Mar 5, 2025
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
10 changes: 9 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@ variables:
- name: _Sign
value: true

# Enable source index only for main branch builds
- ${{ if and(ne(variables['runAsPublic'], 'true'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
- name: enableSourceIndex
value: true
- ${{ else }}:
- name: enableSourceIndex
value: false

resources:
repositories:
- repository: 1ESPipelineTemplates
Expand Down Expand Up @@ -145,7 +153,7 @@ extends:
parameters:
enableMicrobuild: true
enableTelemetry: true
enableSourceIndex: true
enableSourceIndex: ${{ variables['enableSourceIndex'] }}
runAsPublic: ${{ variables['runAsPublic'] }}
# Publish build logs
enablePublishBuildArtifacts: true
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/templates/BuildAndTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,14 @@ steps:
artifactName: "$(Agent.JobName)_CodeCoverageResults"

- ${{ if eq(parameters.isWindows, 'true') }}:
# Publishing will happen in a subsequent step
- script: ${{ parameters.buildScript }}
-projects $(Build.SourcesDirectory)/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj
-restore -build
-pack
-publish $(_PublishArgs)
-configuration ${{ parameters.buildConfig }}
/bl:${{ parameters.repoLogPath }}/transport.binlog
$(_OfficialBuildIdArgs)
displayName: Build and publish docs transport package
displayName: Pack docs transport package

- pwsh: |
$(Build.SourcesDirectory)/src/Libraries/Microsoft.Extensions.AI.Evaluation.Reporting/TypeScript/azure-devops-report/build.ps1 -OutputPath $(Build.Arcade.VSIXOutputPath)
Expand Down
Loading