diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2019-02-22 16:01:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 16:01:03 -0800 |
| commit | 3e8cd50bbf3f510ade4a4e8ab889d1cb184ad6eb (patch) | |
| tree | f919529cb8ccc0bf1f5badb3ad34aefd974d60eb /eng/build-job.yml | |
| parent | 4932d0f6fa87b9a6e3293aacd35cecedde44d87a (diff) | |
| download | coreclr-3e8cd50bbf3f510ade4a4e8ab889d1cb184ad6eb.tar.gz coreclr-3e8cd50bbf3f510ade4a4e8ab889d1cb184ad6eb.tar.bz2 coreclr-3e8cd50bbf3f510ade4a4e8ab889d1cb184ad6eb.zip | |
Correctly build packages for linux-musl-arm64 (#22793)
* Correctly build packages for linux-musl-arm64
Also add build-package step to PR.
* Correctly add back if
* Fix build-packages
Diffstat (limited to 'eng/build-job.yml')
| -rw-r--r-- | eng/build-job.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/eng/build-job.yml b/eng/build-job.yml index 061558fc34..d14ffc1fdf 100644 --- a/eng/build-job.yml +++ b/eng/build-job.yml @@ -140,12 +140,17 @@ jobs: KeyVaultName: EngKeyVault SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat' + # Build packages + - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: + - script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(crossPackagesArg) -OfficialBuildId=$(Build.BuildNumber) $(portableBuildArg) + displayName: Build packages + - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: + - script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(buildConfigUpper) -OfficialBuildId=$(Build.BuildNumber) + displayName: Build packages - # Build packages and publish official build + # Publish official build - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: - - script: ./build-packages.sh -BuildArch=$(archType) -BuildType=$(buildConfigUpper) $(crossPackagesArg) -OfficialBuildId=$(Build.BuildNumber) $(portableBuildArg) - displayName: Build packages - script: ./eng/common/build.sh /p:DotNetPublishToBlobFeed=true --ci --restore --projects $(Build.SourcesDirectory)/eng/empty.proj displayName: Restore blob feed tasks ${{ if eq(parameters.osGroup, 'FreeBSD') }}: @@ -162,8 +167,6 @@ jobs: DotNetCoreSdkDir: /usr/local/dotnet - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: # TODO: pass publish feed url and access token in from the internal pipeline - - script: build-packages.cmd -BuildArch=$(archType) -BuildType=$(buildConfigUpper) -OfficialBuildId=$(Build.BuildNumber) - displayName: Build packages - powershell: eng\common\build.ps1 /p:DotNetPublishToBlobFeed=true -ci -restore -projects $(Build.SourcesDirectory)\eng\empty.proj displayName: Restore blob feed tasks - powershell: eng\common\msbuild.ps1 -ci src\publishwitharcade.proj /p:__BuildType=$(buildConfigUpper) /p:__BuildArch=$(archType) /p:OSIdentifier=$(osIdentifier) /p:AzureFeedUrl=$(dotnetfeedUrl) /p:AzureAccountKey=$(dotnetfeedPAT) |