Merge pull request #95 from brthor/dockerci
Run Docker Build in Ubuntu CI
This commit is contained in:
commit
fa57f7f2f2
2 changed files with 6 additions and 2 deletions
|
@ -7,7 +7,7 @@ def project = 'dotnet/cli'
|
||||||
|
|
||||||
def osList = ['Ubuntu', 'OSX', 'Windows_NT']
|
def osList = ['Ubuntu', 'OSX', 'Windows_NT']
|
||||||
|
|
||||||
def machineLabelMap = ['Ubuntu':'ubuntu',
|
def machineLabelMap = ['Ubuntu':'ubuntu-doc',
|
||||||
'OSX':'mac',
|
'OSX':'mac',
|
||||||
'Windows_NT':'windows']
|
'Windows_NT':'windows']
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,11 @@
|
||||||
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
|
if [[ "$(uname)" == "Linux" ]]; then
|
||||||
|
$SCRIPT_DIR/dockerbuild.sh $@
|
||||||
|
else
|
||||||
$SCRIPT_DIR/../build.sh $@
|
$SCRIPT_DIR/../build.sh $@
|
||||||
|
fi
|
||||||
|
|
||||||
ret_code=$?
|
ret_code=$?
|
||||||
exit $ret_code
|
exit $ret_code
|
||||||
|
|
Loading…
Reference in a new issue