diff options
-rwxr-xr-x | build-packages.sh | 7 | ||||
-rw-r--r-- | eng/build-job.yml | 13 | ||||
-rw-r--r-- | src/.nuget/dir.props | 3 |
3 files changed, 18 insertions, 5 deletions
diff --git a/build-packages.sh b/build-packages.sh index 80cdc45f35..576a01daa1 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -113,6 +113,13 @@ done initDistroRid +if [ "${__DistroRid}" = "linux-musl-arm64" ]; then + # ArchGroup is generally determined from parsing {}-{}; however, linux-musl-arm64 + # will break this logic. To work around this, pass ArchGroup explicitely. + + export ArchGroup=arm64 +fi + $__ProjectRoot/dotnet.sh msbuild /nologo /verbosity:minimal /clp:Summary \ /p:__BuildOS=$__BuildOS /flp:v=detailed\;Append\;LogFile=build-packages.log \ /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll\;LogFile=binclash.log \ 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) diff --git a/src/.nuget/dir.props b/src/.nuget/dir.props index b97f3d81a2..29ea200dd0 100644 --- a/src/.nuget/dir.props +++ b/src/.nuget/dir.props @@ -148,6 +148,9 @@ <OfficialBuildRID Include="linux-arm64"> <Platform>arm64</Platform> </OfficialBuildRID> + <OfficialBuildRID Include="linux-musl-arm64"> + <Platform>arm64</Platform> + </OfficialBuildRID> <OfficialBuildRID Include="tizen.4.0.0-armel"> <Platform>armel</Platform> </OfficialBuildRID> |