Atomic update of the LKG and the generated nuget/cgmanifest.json (#980)

The new LKG contains changes to how nuget/cgmanifest.json is generated. To avoid breaking our validation, the LKG and the generated nuget/cgmanifest.json must be updated together (this is a one-off manual update).
This commit is contained in:
Aleksandar Milicevic 2019-10-02 10:13:24 -07:00 коммит произвёл GitHub
Родитель b62ce412a0
Коммит fc32417369
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 492 добавлений и 493 удалений

Просмотреть файл

@ -17,7 +17,6 @@ set MINIMAL_LAB=0
REM These are provided to bxl.cmd only when /lab is specified (automated builds).
REM For lab builds, log full outputs.
REM For lab builds, retry unit tests automatically.
REM Consider adding the following to lab builds: /validateCgManifestForNugets:%ENLISTMENTROOT%\cg\nuget\cgmanifest.json
set LAB_SPECIFIC_ARGS=-DisableInteractive /logOutput:FullOutputOnError /p:RetryXunitTests=1 /processRetries:3 /ado
set INTERNAL_BUILD_ARGS=/p:[Sdk.BuildXL]microsoftInternal=1
@ -73,7 +72,7 @@ if EXIST %ENLISTMENTROOT%\Out\frontend\Nuget\specs (
set start=%time%
set stepName=Building 'debug\net472' and 'debug\win-x64' using Lkg and deploying to RunCheckinTests
call :StatusMessage %stepName%
call :RunBxl -Use LKG -Deploy RunCheckinTests /q:DebugNet472 /q:DebugDotNetCore /f:output='%ENLISTMENTROOT%\Out\Bin\debug\net472\*'oroutput='%ENLISTMENTROOT%\Out\Bin\debug\win-x64\*'oroutput='%ENLISTMENTROOT%\Out\Bin\tests\debug\*' %BUILDXL_ARGS% /enableLazyOutputs- /TraceInfo:RunCheckinTests=LKG /useCustomPipDescriptionOnConsole-
call :RunBxl -Use LKG -Deploy RunCheckinTests /q:DebugNet472 /q:DebugDotNetCore /f:output='%ENLISTMENTROOT%\Out\Bin\debug\net472\*'oroutput='%ENLISTMENTROOT%\Out\Bin\debug\win-x64\*'oroutput='%ENLISTMENTROOT%\Out\Bin\tests\debug\*' %BUILDXL_ARGS% /enableLazyOutputs- /TraceInfo:RunCheckinTests=LKG /useCustomPipDescriptionOnConsole- /validateCgManifestForNugets:%ENLISTMENTROOT%\cg\nuget\cgmanifest.json
if %ERRORLEVEL% NEQ 0 goto BadLKGMessage
call :RecordStep "%stepName%" %start%

Просмотреть файл

@ -1,3 +1,3 @@
set BUILDXL_LKG_NAME=BuildXL.win-x64
set BUILDXL_LKG_VERSION=0.1.0-20190925.15
set BUILDXL_LKG_VERSION=0.1.0-20191001.4
set BUILDXL_LKG_FEED_1=https://pkgs.dev.azure.com/1essharedassets/_packaging/BuildXL/nuget/v3/index.json

2
bxl.sh
Просмотреть файл

@ -64,7 +64,7 @@ function setInternal() {
function compileWithBxl() {
local args=(
--config "$MY_DIR/config.dsc"
# TODO(uncomment after new LKG is published): /generateCgManifestForNugets:"${MY_DIR}/cg/nuget/cgmanifest.json"
/generateCgManifestForNugets:"${MY_DIR}/cg/nuget/cgmanifest.json"
/fancyConsoleMaxStatusPips:10
/nowarn:11319 # DX11319: nuget version mismatch
"$@"

Разница между файлами не показана из-за своего большого размера Загрузить разницу