Add ci argument to build script instead of checking environment variable (dotnet...

* Add ci argument to build script instead of checking environment variable

* Remove explicit passing of ContinuousIntegrationBuild in pipeline job

Commit migrated from https://github.com/dotnet/coreclr/commit/18fa1d0b9934cc8f09a1cc0979bd325b6a97c108

diff --git a/eng/build-job.yml b/eng/build-job.yml
index 184a1bb..6a2e5f0 100644 (file)
--- a/eng/build-job.yml
+++ b/eng/build-job.yml
@@ -123,10 +123,10 @@ jobs:
 
     # Build
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./build.sh $(buildConfig) $(archType) $(crossArg) -skiptests -skipnuget $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg) /p:ContinuousIntegrationBuild=true
+      - script: ./build.sh $(buildConfig) $(archType) $(crossArg) -ci -skiptests -skipnuget $(clangArg) $(stripSymbolsArg) $(officialBuildIdArg)
         displayName: Build product
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: set __TestIntermediateDir=int&&build.cmd $(buildConfig) $(archType) -skiptests -skipbuildpackages $(officialBuildIdArg) $(ibcOptimizeArg) $(enforcePgoArg) /p:ContinuousIntegrationBuild=true
+      - script: set __TestIntermediateDir=int&&build.cmd $(buildConfig) $(archType) -ci -skiptests -skipbuildpackages $(officialBuildIdArg) $(ibcOptimizeArg) $(enforcePgoArg)
         displayName: Build product
 
     # Sign on Windows

diff --git a/eng/test-job.yml b/eng/test-job.yml
index f71230e..e7c0efb 100644 (file)
--- a/eng/test-job.yml
+++ b/eng/test-job.yml
@@ -143,10 +143,10 @@ jobs:
 
     # Build tests
     - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
-      - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(crossgenArg) $(clangArg) $(testhostArg)
+      - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) $(priorityArg) $(crossgenArg) $(clangArg) $(testhostArg) ci
         displayName: Build tests
     - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
-      - script: build-test.cmd $(buildConfig) $(archType) $(priorityArg) $(crossgenArg) $(testhostArg)
+      - script: build-test.cmd $(buildConfig) $(archType) $(priorityArg) $(crossgenArg) $(testhostArg) ci
         displayName: Build tests
 
 
@@ -341,7 +341,7 @@ jobs:
           ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
             archiveType: zip
             archiveFile: $(Build.SourcesDirectory)/bin/tests/$(osGroup).$(archType).$(buildConfigUpper).zip
-          includeRootFolder: true 
+          includeRootFolder: true
 
     - ${{ if and(eq(parameters.publishTestArtifacts, true), ne(parameters.corefxTests, true)) }}:
       - task: PublishBuildArtifacts@1

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index 7c04b3d..70811ff 100644 (file)
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -7,11 +7,6 @@ set "__MsgPrefix=BUILDTEST: "
 
 echo %__MsgPrefix%Starting Build at %TIME%
 
-REM Set variables used when running in an Azure DevOps task
-if defined TF_BUILD (
-    set __ArcadeScriptArgs="-ci"
-    set __ErrMsgPrefix=##vso[task.logissue type=error]
-)
 
 set __ThisScriptDir="%~dp0"
 
@@ -87,6 +82,8 @@ if /i "%1" == "debug"                 (set __BuildType=Debug&set processedArgs=!
 if /i "%1" == "release"               (set __BuildType=Release&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "checked"               (set __BuildType=Checked&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 
+if /i "%1" == "ci"                    (set __ArcadeScriptArgs="-ci"&set __ErrMsgPrefix=##vso[task.logissue type=error]&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+
 if /i "%1" == "skipmanaged"           (set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "skipnative"            (set __SkipNative=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "buildtesthostonly"     (set __SkipNative=1&set __SkipManaged=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index 0f38999..1923962 100755 (executable)
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -656,12 +656,6 @@ case $OSName in
         ;;
 esac
 
-# Set variables used when running in an Azure DevOps task
-if [[ ! -z $TF_BUILD ]]; then
-  __ArcadeScriptArgs="--ci"
-  __ErrMsgPrefix="##vso[task.logissue type=error]"
-fi
-
 __BuildType=Debug
 __CodeCoverage=
 __IncludeTests=INCLUDE_TESTS
@@ -751,6 +745,11 @@ while :; do
             __BuildType=Release
             ;;
 
+        ci|-ci)
+            __ArcadeScriptArgs="--ci"
+            __ErrMsgPrefix="##vso[task.logissue type=error]"
+            ;;
+
         coverage)
             __CodeCoverage=Coverage
             ;;

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
index 5b0e71d..9575109 100644 (file)
--- a/src/coreclr/build.cmd
+++ b/src/coreclr/build.cmd
@@ -7,12 +7,6 @@ set "__MsgPrefix=BUILD: "
 
 echo %__MsgPrefix%Starting Build at %TIME%
 
-REM Set variables used when running in an Azure DevOps task
-if defined TF_BUILD (
-    set __ArcadeScriptArgs="-ci"
-    set __ErrMsgPrefix=##vso[task.logissue type=error]
-)
-
 set __ThisScriptFull="%~f0"
 set __ThisScriptDir="%~dp0"
 
@@ -138,6 +132,8 @@ if /i "%1" == "-debug"               (set __BuildTypeDebug=1&set processedArgs=!
 if /i "%1" == "-checked"             (set __BuildTypeChecked=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 if /i "%1" == "-release"             (set __BuildTypeRelease=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
 
+if /i "%1" == "-ci"                  (set __ArcadeScriptArgs="-ci"&set __ErrMsgPrefix=##vso[task.logissue type=error]&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)
+
 REM TODO these are deprecated remove them eventually
 REM don't add more, use the - syntax instead
 if /i "%1" == "all"                 (set __BuildAll=1&set processedArgs=!processedArgs! %1&shift&goto Arg_Loop)

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
index 937580c..43b27b8 100755 (executable)
--- a/src/coreclr/build.sh
+++ b/src/coreclr/build.sh
@@ -612,12 +612,6 @@ case $OSName in
         ;;
 esac
 
-# Set variables used when running in an Azure DevOps task
-if [[ ! -z $TF_BUILD ]]; then
-  __ArcadeScriptArgs="--ci"
-  __ErrMsgPrefix="##vso[task.logissue type=error]"
-fi
-
 __BuildType=Debug
 __CodeCoverage=
 __IgnoreWarnings=0
@@ -725,6 +719,11 @@ while :; do
             __BuildType=Release
             ;;
 
+        ci|-ci)
+            __ArcadeScriptArgs="--ci"
+            __ErrMsgPrefix="##vso[task.logissue type=error]"
+            ;;
+
         coverage|-coverage)
             __CodeCoverage=Coverage
             ;;

diff --git a/src/coreclr/init-tools.cmd b/src/coreclr/init-tools.cmd
index 5d57334..e525e5d 100644 (file)
--- a/src/coreclr/init-tools.cmd
+++ b/src/coreclr/init-tools.cmd
@@ -17,11 +17,6 @@ set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild
 set BUILD_TOOLS_SEMAPHORE_DIR=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%
 set BUILD_TOOLS_SEMAPHORE=%BUILD_TOOLS_SEMAPHORE_DIR%\init-tools.completed
 
-REM Set variables used when running in an Azure DevOps task
-if defined TF_BUILD (
-    set __ErrMsgPrefix=##vso[task.logissue type=error]
-)
-
 :: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated
 if [%1]==[force] (
   if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%"

diff --git a/src/coreclr/init-tools.sh b/src/coreclr/init-tools.sh
index b0c0354..b39e744 100755 (executable)
--- a/src/coreclr/init-tools.sh
+++ b/src/coreclr/init-tools.sh
@@ -15,11 +15,6 @@ __BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_P
 __INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild"
 __BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete"
 
-# Set variables used when running in an Azure DevOps task
-if [[ ! -z $TF_BUILD ]]; then
-  __ErrMsgPrefix="##vso[task.logissue type=error]"
-fi
-
 if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then
     echo "Tools are already initialized"
     return #return instead of exit because this script is inlined in other scripts which we don't want to exit