SignalR 1.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255
  1. commit 85b12e9fa18193c81c930032dc14755805b71c8e
  2. Author: Pranav K <[email protected]>
  3. Date: Mon Mar 19 12:27:38 2018 -0700
  4. Enable dotnet-build bot
  5. diff --git a/.appveyor.yml b/.appveyor.yml
  6. index f8d65af7e43..35b1131ac9d 100644
  7. --- a/.appveyor.yml
  8. +++ b/.appveyor.yml
  9. @@ -7,7 +7,7 @@ branches:
  10. - /^release\/.*$/
  11. - /^(.*\/)?ci-.*$/
  12. build_script:
  13. -- ps: .\run.ps1 default-build
  14. +- ps: .\run.ps1 -ci default-build
  15. on_finish:
  16. - ps: 7z a testlogs.zip testlogs
  17. - ps: Push-AppveyorArtifact testlogs.zip
  18. @@ -16,8 +16,6 @@ install:
  19. clone_depth: 1
  20. environment:
  21. global:
  22. - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  23. - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  24. ASPNETCORE_TEST_LOG_DIR: $(APPVEYOR_BUILD_FOLDER)\testlogs
  25. test: 'off'
  26. deploy: 'off'
  27. diff --git a/.travis.yml b/.travis.yml
  28. index e84ae1c10d1..06281bb0ef3 100644
  29. --- a/.travis.yml
  30. +++ b/.travis.yml
  31. @@ -5,8 +5,6 @@ services:
  32. - docker
  33. env:
  34. global:
  35. - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
  36. - - DOTNET_CLI_TELEMETRY_OPTOUT: 1
  37. - SIGNALR_TESTS_VERBOSE: 1
  38. - TRAVIS_NODE_VERSION: 8.9.3
  39. mono: none
  40. @@ -28,4 +26,4 @@ before_install:
  41. - nvm install $TRAVIS_NODE_VERSION
  42. - if test "$TRAVIS_OS_NAME" == "linux"; then docker pull redis; fi
  43. script:
  44. -- ./build.sh
  45. +- ./build.sh --ci
  46. diff --git a/build/buildpipeline/linux.groovy b/build/buildpipeline/linux.groovy
  47. new file mode 100644
  48. index 00000000000..6bf3a443685
  49. --- /dev/null
  50. +++ b/build/buildpipeline/linux.groovy
  51. @@ -0,0 +1,11 @@
  52. +@Library('dotnet-ci') _
  53. +
  54. +simpleNode('Ubuntu16.04', 'latest-or-auto-docker') {
  55. + stage ('Checking out source') {
  56. + checkout scm
  57. + }
  58. + stage ('Build') {
  59. + def environment = 'export SIGNALR_TESTS_VERBOSE=1'
  60. + sh "${environment} && ./build.sh --ci"
  61. + }
  62. +}
  63. diff --git a/build/buildpipeline/osx.groovy b/build/buildpipeline/osx.groovy
  64. new file mode 100644
  65. index 00000000000..c5d4c7d03a5
  66. --- /dev/null
  67. +++ b/build/buildpipeline/osx.groovy
  68. @@ -0,0 +1,11 @@
  69. +@Library('dotnet-ci') _
  70. +
  71. +simpleNode('OSX10.12','latest') {
  72. + stage ('Checking out source') {
  73. + checkout scm
  74. + }
  75. + stage ('Build') {
  76. + def environment = 'export SIGNALR_TESTS_VERBOSE=1'
  77. + sh "${environment} && ./build.sh --ci"
  78. + }
  79. +}
  80. diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy
  81. new file mode 100644
  82. index 00000000000..e915cadae12
  83. --- /dev/null
  84. +++ b/build/buildpipeline/pipeline.groovy
  85. @@ -0,0 +1,18 @@
  86. +import org.dotnet.ci.pipelines.Pipeline
  87. +
  88. +def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy')
  89. +def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy')
  90. +def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy')
  91. +String configuration = 'Release'
  92. +def parameters = [
  93. + 'Configuration': configuration
  94. +]
  95. +
  96. +windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters)
  97. +windowsPipeline.triggerPipelineOnGithubPush(parameters)
  98. +
  99. +linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters)
  100. +linuxPipeline.triggerPipelineOnGithubPush(parameters)
  101. +
  102. +osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters)
  103. +osxPipeline.triggerPipelineOnGithubPush(parameters)
  104. diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy
  105. new file mode 100644
  106. index 00000000000..8d26f313d49
  107. --- /dev/null
  108. +++ b/build/buildpipeline/windows.groovy
  109. @@ -0,0 +1,12 @@
  110. +@Library('dotnet-ci') _
  111. +
  112. +// 'node' indicates to Jenkins that the enclosed block runs on a node that matches
  113. +// the label 'windows-with-vs'
  114. +simpleNode('Windows_NT','latest') {
  115. + stage ('Checking out source') {
  116. + checkout scm
  117. + }
  118. + stage ('Build') {
  119. + bat '.\\run.cmd -CI default-build'
  120. + }
  121. +}
  122. diff --git a/client-ts/FunctionalTests/package-lock.json b/client-ts/FunctionalTests/package-lock.json
  123. index 86487f29993..ed6372b1937 100644
  124. --- a/client-ts/FunctionalTests/package-lock.json
  125. +++ b/client-ts/FunctionalTests/package-lock.json
  126. @@ -658,4 +658,4 @@
  127. "dev": true
  128. }
  129. }
  130. -}
  131. \ No newline at end of file
  132. +}
  133. diff --git a/korebuild-lock.txt b/korebuild-lock.txt
  134. index e40ef6651b0..f531e7b0f73 100644
  135. --- a/korebuild-lock.txt
  136. +++ b/korebuild-lock.txt
  137. @@ -1,2 +1,2 @@
  138. -version:2.1.0-preview2-15742
  139. -commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962
  140. +version:2.1.0-preview2-15744
  141. +commithash:9e15cb6062ab5b9790d3fa699e018543a6950713
  142. diff --git a/run.ps1 b/run.ps1
  143. index 27dcf848f84..96c6c54c696 100644
  144. --- a/run.ps1
  145. +++ b/run.ps1
  146. @@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c
  147. .PARAMETER Update
  148. Updates KoreBuild to the latest version even if a lock file is present.
  149. +.PARAMETER Reinstall
  150. +Re-installs KoreBuild
  151. +
  152. .PARAMETER ConfigFile
  153. The path to the configuration file that stores values. Defaults to korebuild.json.
  154. .PARAMETER ToolsSourceSuffix
  155. The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
  156. +.PARAMETER CI
  157. +Sets up CI specific settings and variables.
  158. +
  159. .PARAMETER Arguments
  160. Arguments to be passed to the command
  161. @@ -65,8 +71,10 @@ param(
  162. [string]$ToolsSource,
  163. [Alias('u')]
  164. [switch]$Update,
  165. - [string]$ConfigFile,
  166. + [switch]$Reinstall,
  167. [string]$ToolsSourceSuffix,
  168. + [string]$ConfigFile = $null,
  169. + [switch]$CI,
  170. [Parameter(ValueFromRemainingArguments = $true)]
  171. [string[]]$Arguments
  172. )
  173. @@ -93,6 +101,10 @@ function Get-KoreBuild {
  174. $version = $version.TrimStart('version:').Trim()
  175. $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
  176. + if ($Reinstall -and (Test-Path $korebuildPath)) {
  177. + Remove-Item -Force -Recurse $korebuildPath
  178. + }
  179. +
  180. if (!(Test-Path $korebuildPath)) {
  181. Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
  182. New-Item -ItemType Directory -Path $korebuildPath | Out-Null
  183. @@ -188,7 +200,7 @@ $korebuildPath = Get-KoreBuild
  184. Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
  185. try {
  186. - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile
  187. + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI
  188. Invoke-KoreBuildCommand $Command @Arguments
  189. }
  190. finally {
  191. diff --git a/run.sh b/run.sh
  192. index 834961fc3a5..4606a42e786 100755
  193. --- a/run.sh
  194. +++ b/run.sh
  195. @@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
  196. [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
  197. verbose=false
  198. update=false
  199. +reinstall=false
  200. repo_path="$DIR"
  201. channel=''
  202. tools_source=''
  203. tools_source_suffix=''
  204. +ci=false
  205. #
  206. # Functions
  207. @@ -38,6 +40,8 @@ __usage() {
  208. echo " -s|--tools-source|-ToolsSource <URL> The base url where build tools can be downloaded. Overrides the value from the config file."
  209. echo " --tools-source-suffix|-ToolsSourceSuffix <SUFFIX> The suffix to append to tools-source. Useful for query strings."
  210. echo " -u|--update Update to the latest KoreBuild even if the lock file is present."
  211. + echo " --reinstall Reinstall KoreBuild."
  212. + echo " --ci Apply CI specific settings and environment variables."
  213. echo ""
  214. echo "Description:"
  215. echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
  216. @@ -62,6 +66,10 @@ get_korebuild() {
  217. version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
  218. local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
  219. + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then
  220. + rm -rf "$korebuild_path"
  221. + fi
  222. +
  223. {
  224. if [ ! -d "$korebuild_path" ]; then
  225. mkdir -p "$korebuild_path"
  226. @@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do
  227. -u|--update|-Update)
  228. update=true
  229. ;;
  230. + --reinstall|-[Rr]einstall)
  231. + reinstall=true
  232. + ;;
  233. + --ci)
  234. + ci=true
  235. + ;;
  236. --verbose|-Verbose)
  237. verbose=true
  238. ;;
  239. @@ -227,5 +241,5 @@ fi
  240. [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
  241. get_korebuild
  242. -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file"
  243. +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"
  244. invoke_korebuild_command "$command" "$@"