mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add skip-prereqs switch

Browse source
This commit is contained in:
Andrew Stanton-Nurse 2016-02-16 12:37:47 -08:00
parent eb607fec08
commit f57605c4c3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.sh
View file

@ -31,12 +31,17 @@ while [[ $# > 0 ]]; do
export DOCKER_IMAGENAME=$2
shift
;;
--skip-prereqs)
# Allow CI to disable prereqs check since the CI has the pre-reqs but not ldconfig it seems
export DOTNET_INSTALL_SKIP_PREREQS=1
;;
--help)
echo "Usage: $0 [--configuration <CONFIGURATION>] [--nopackage] [--docker <IMAGENAME>] [--help] <TARGETS...>"
echo "Usage: $0 [--configuration <CONFIGURATION>] [--skip-prereqs] [--nopackage] [--docker <IMAGENAME>] [--help] <TARGETS...>"
echo ""
echo "Options:"
echo " --configuration <CONFIGURATION> Build the specified Configuration (Debug or Release, default: Debug)"
echo " --nopackage Skip packaging targets"
echo " --skip-prereqs Skip checks for pre-reqs in dotnet_install"
echo " --docker <IMAGENAME> Build in Docker using the Dockerfile located in scripts/docker/IMAGENAME"
echo " --help Display this help message"
echo " <TARGETS...> The build targets to run (Init, Compile, Publish, etc.; Default is a full build and publish)"

4
netci.groovy
View file

@ -29,11 +29,11 @@ def static getBuildJobName(def configuration, def os) {
buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} Default"
}
else if (os == 'Ubuntu') {
buildCommand = "./build.sh --configuration ${lowerConfiguration} --docker ubuntu Default"
buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --docker ubuntu Default"
}
else {
// Jenkins non-Ubuntu CI machines don't have docker
buildCommand = "./build.sh --configuration ${lowerConfiguration} Default"
buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} Default"
}
def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {