Skip to content

Commit 53c0532

Browse files
committed
Refactor to support custom publish arg
1 parent fa20f34 commit 53c0532

File tree

2 files changed

+7
-172
lines changed

2 files changed

+7
-172
lines changed

.azure/pipelines/ci.yml

Lines changed: 7 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -625,14 +625,6 @@ stages:
625625
- name: Linux_musl_arm64_Packages
626626
path: artifacts/packages/
627627

628-
# Build Linux X64 source-build
629-
- template: /eng/common/templates/job/source-build.yml
630-
parameters:
631-
platform:
632-
name: 'Managed'
633-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754'
634-
buildScript: './eng/build.sh'
635-
636628
- ${{ if ne(variables['PostBuildSign'], 'true') }}:
637629
- template: jobs/codesign-xplat.yml
638630
parameters:
@@ -774,56 +766,12 @@ stages:
774766
includeForks: true
775767

776768
# Source build
777-
- job: Source_Build
778-
displayName: 'Test: Linux Source Build'
779-
container: centos:7
780-
pool:
781-
vmImage: 'ubuntu-18.04'
782-
variables:
783-
LC_ALL: 'en_US.UTF-8'
784-
LANG: 'en_US.UTF-8'
785-
LANGUAGE: 'en_US.UTF-8'
786-
DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet
787-
# This isn't needed in the path because build does not need to _use_ global tools.
788-
DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
789-
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
790-
steps:
791-
- script: |
792-
source eng/common/native/common-library.sh
793-
mkdir -p $(System.DefaultWorkingDirectory)/.tools
794-
GetFile https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 $(System.DefaultWorkingDirectory)/.tools/jq
795-
chmod +x $(System.DefaultWorkingDirectory)/.tools/jq
796-
echo "##vso[task.prependpath]$(System.DefaultWorkingDirectory)/.tools"
797-
displayName: Install jq
798-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
799-
- task: Bash@3
800-
displayName: Setup Private Feeds Credentials
801-
inputs:
802-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
803-
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
804-
env:
805-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
806-
- script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false $(_InternalRuntimeDownloadArgs)
807-
displayName: Run ci-source-build.sh
808-
- task: PublishBuildArtifacts@1
809-
displayName: Upload logs
810-
condition: always()
811-
continueOnError: true
812-
inputs:
813-
pathtoPublish: artifacts/log/
814-
artifactName: Source_Build_Logs
815-
artifactType: Container
816-
parallel: true
817-
- task: PublishBuildArtifacts@1
818-
displayName: Upload package artifacts
819-
# Only capture source build artifacts in PRs for the sake of inspecting
820-
# changes that impact source-build. The artifacts from this build pipeline are never actually used.
821-
condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest'))
822-
inputs:
823-
pathtoPublish: artifacts/packages/
824-
artifactName: Source_Build_Packages
825-
artifactType: Container
826-
parallel: true
769+
- template: /eng/common/templates/job/source-build.yml
770+
parameters:
771+
platform:
772+
name: 'Managed'
773+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754'
774+
buildScript: './eng/build.sh'
827775

828776
# Publish to the BAR
829777
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -852,7 +800,7 @@ stages:
852800
- Linux_musl_arm_build
853801
- Linux_musl_arm64_build
854802
# In addition to the dependencies above, ensure the build was successful overall.
855-
- Source_Build
803+
- Source_Build_Managed
856804
pool:
857805
vmImage: vs2017-win2016
858806
publishUsingPipelines: ${{ variables._PublishUsingPipelines }}

eng/scripts/ci-source-build.sh

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)