diff --git a/.vsts.pipelines/builds/matrix.yml b/.vsts.pipelines/builds/matrix.yml index dd416935cb..9136ed99c8 100644 --- a/.vsts.pipelines/builds/matrix.yml +++ b/.vsts.pipelines/builds/matrix.yml @@ -29,6 +29,18 @@ jobs: matrix: Offline: { type: Offline} +- template: ../jobs/ci-linux.yml + parameters: + job: centos8 + imageName: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-8-daa5116-20200325130212 + reportPrebuiltLeaks: false + systemLibunwind: false + matrix: + Production: { generatePrebuiltBurndown: true, runUnitTests: true } + Online: { type: Online } + Offline: { type: Offline } + Offline Portable: { type: Offline Portable } + - template: ../jobs/ci-linux.yml parameters: job: debian9 diff --git a/.vsts.pipelines/jobs/ci-linux.yml b/.vsts.pipelines/jobs/ci-linux.yml index a129ad8a1e..c75fe43021 100644 --- a/.vsts.pipelines/jobs/ci-linux.yml +++ b/.vsts.pipelines/jobs/ci-linux.yml @@ -35,6 +35,7 @@ jobs: generatePrebuiltBurndown: ${{ parameters.generatePrebuiltBurndown }} rootDirectory: $(Build.SourcesDirectory)/.. stagingDirectory: $(rootDirectory)/sb/staging + systemLibunwind: ${{ parameters.systemLibunwind }} tarballName: tarball_$(Build.BuildId) SOURCE_BUILD_SKIP_SUBMODULE_CHECK: true # Default type, can be overridden by matrix legs. @@ -66,6 +67,7 @@ jobs: $(docker.run) $(docker.src.map) $(docker.src.work) $(imageName) ./build.sh \ /p:Configuration=$(sb.configuration) \ /p:PortableBuild=$(sb.portable) \ + /p:UseSystemLibunwind=$(systemLibunwind) \ /p:ArchiveDownloadedPackages=$(sb.tarball) \ /p:FailOnPrebuiltBaselineError=$failOnBaselineError \ /p:ProdConBlobFeedUrlPrefix=$(prodConBlobFeedUrlPrefix) \ @@ -204,6 +206,7 @@ jobs: $(docker.run) $(docker.tb.map) $(docker.tb.work) $networkArg $(imageName) "$(tarballName)/build.sh" -- \ /p:Configuration=$(sb.configuration) \ /p:PortableBuild=$(sb.portable) \ + /p:UseSystemLibunwind=$(systemLibunwind) \ /p:FailOnPrebuiltBaselineError=true \ $poisonArg du -h $(rootDirectory) | sort -h | tail -n 50 diff --git a/dir.props b/dir.props index 74b7c8d9af..1f263f7d85 100644 --- a/dir.props +++ b/dir.props @@ -13,6 +13,7 @@ true false true + $(UseSystemLibraries) true diff --git a/eng/Versions.props b/eng/Versions.props index 0a541f185d..3fafd4a2fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,6 +8,6 @@ 1.0.0-beta.20107.1 - 0.1.0-3.1.101.1 + 0.1.0-3.1.101.2 diff --git a/repos/coreclr.common.props b/repos/coreclr.common.props index 33af7f0f4b..c488c719d0 100644 --- a/repos/coreclr.common.props +++ b/repos/coreclr.common.props @@ -9,7 +9,7 @@ $(BuildArguments) -skiprestore $(BuildArguments) -nopgooptimize $(BuildArguments) msbuildonunsupportedplatform - $(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE + $(BuildArguments) cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE $(BuildArguments) skipnuget cross -skiprestore cmakeargs -DFEATURE_GDBJIT=TRUE $(BuildArguments) -clang6.0 /p:PortableBuild=true