Skip to content

Commit

Permalink
Clean up build definition (#399)
Browse files Browse the repository at this point in the history
  • Loading branch information
tlmii authored Oct 14, 2020
1 parent 7df8b12 commit 492e230
Showing 1 changed file with 3 additions and 24 deletions.
27 changes: 3 additions & 24 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ variables:
# Variables for public PR builds
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- name: _HelixSource
value: pr/aspnet/HttpRepl/$(Build.SourceBranch)
value: pr/dotnet/HttpRepl/$(Build.SourceBranch)

# Variables for internal Official builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- name: _HelixSource
value: official/aspnet/HttpRepl/$(Build.SourceBranch)
value: official/dotnet/HttpRepl/$(Build.SourceBranch)

resources:
containers:
Expand Down Expand Up @@ -61,7 +61,7 @@ stages:
enablePublishBuildArtifacts: true
enablePublishTestResults: true
enableTelemetry: true
helixRepo: aspnet/HttpRepl
helixRepo: dotnet/HttpRepl
# enableMicrobuild can't be read from a user-defined variable (Azure DevOps limitation)
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
enableMicrobuild: true
Expand Down Expand Up @@ -111,13 +111,6 @@ stages:
name: Build
displayName: Build
condition: succeeded()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
condition: always()
continueOnError: true
inputs:
testRunner: xunit
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
- task: PublishBuildArtifacts@1
displayName: Publish Packages
condition: and(eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
Expand Down Expand Up @@ -159,13 +152,6 @@ stages:
name: Build
displayName: Build
condition: succeeded()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
condition: always()
continueOnError: true
inputs:
testRunner: xunit
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
- task: PublishBuildArtifacts@1
displayName: Publish Logs
condition: always()
Expand Down Expand Up @@ -199,13 +185,6 @@ stages:
name: Build
displayName: Build
condition: succeeded()
- task: PublishTestResults@2
displayName: Publish xUnit Test Results
condition: always()
continueOnError: true
inputs:
testRunner: xunit
testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'
- task: PublishBuildArtifacts@1
displayName: Publish Logs
condition: always()
Expand Down

0 comments on commit 492e230

Please sign in to comment.