Move cibuild.sh

build/scripts/cibuild.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+set -e
+set -u
+
+root_path="$(cd -P "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
+
+# $HOME is unset when running the mac unit tests.
+if [[ -z "${HOME+x}" ]]
+then
+    # Note that while ~ usually refers to $HOME, in the case where $HOME is unset,
+    # it looks up the current user's home dir, which is what we want.
+    # https://www.gnu.org/software/bash/manual/html_node/Tilde-Expansion.html
+    export HOME="$(cd ~ && pwd)"
+fi
+
+# There's no reason to send telemetry or prime a local package cach when building
+# in CI.
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+
+echo "Building this commit:"
+git show --no-patch --pretty=raw HEAD
+
+"${root_path}"/build.sh --restore --bootstrap --build --test "$@"
+
+echo "Killing VBCSCompiler"
+dotnet "${root_path}"/Binaries/Bootstrap/bincore/VBCSCompiler.dll -shutdown

cibuild.sh

@@ -2,29 +2,5 @@
 # Copyright (c) .NET Foundation and contributors. All rights reserved.
 # Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-set -e
-set -u
-
-root_path="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# $HOME is unset when running the mac unit tests.
-if [[ -z "${HOME+x}" ]]
-then
-    # Note that while ~ usually refers to $HOME, in the case where $HOME is unset,
-    # it looks up the current user's home dir, which is what we want.
-    # https://www.gnu.org/software/bash/manual/html_node/Tilde-Expansion.html
-    export HOME="$(cd ~ && pwd)"
-fi
-
-# There's no reason to send telemetry or prime a local package cach when building
-# in CI.
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-echo "Building this commit:"
-git show --no-patch --pretty=raw HEAD
-
-"${root_path}"/build.sh --restore --bootstrap --build --test "$@"
-
-echo "Killing VBCSCompiler"
-dotnet "${root_path}"/Binaries/Bootstrap/bincore/VBCSCompiler.dll -shutdown
+# Temporary file until the netci.groovy change to use the new location propogates
+exec ./build/scripts/cibuild.sh "$@"

netci.groovy

@@ -105,7 +105,7 @@ commitPullList.each { isPr ->
   def myJob = job(jobName) {
     description("Ubuntu 14.04 tests")
                   steps {
-                    shell("./cibuild.sh --debug")
+                    shell("./build/scripts/cibuild.sh --debug")
                   }
                 }
 
@@ -122,7 +122,7 @@ commitPullList.each { isPr ->
   def myJob = job(jobName) {
     description("Ubuntu 16.04 tests")
                   steps {
-                    shell("./cibuild.sh --debug")
+                    shell("./build/scripts/cibuild.sh --debug")
                   }
                 }
 
@@ -139,7 +139,7 @@ commitPullList.each { isPr ->
   def myJob = job(jobName) {
     description("Mac tests")
     steps {
-      shell("./cibuild.sh --debug")
+      shell("./build/scripts/cibuild.sh --debug")
     }
   }