Merge pull request #18459 from Microsoft/jjh/winci-bash4fix
Windows CI Fix: Allow bash v4
This commit is contained in:
commit
31a31adf7e
|
@ -56,6 +56,13 @@ while [ $# -gt 0 ]; do
|
||||||
layersFs=$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum')
|
layersFs=$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum')
|
||||||
|
|
||||||
IFS=$'\n'
|
IFS=$'\n'
|
||||||
|
# bash v4 on Windows CI requires CRLF seperator
|
||||||
|
if [ "$(go env GOHOSTOS)" = 'windows' ]; then
|
||||||
|
major=$(echo ${BASH_VERSION%%[^0.9]} | cut -d. -f1)
|
||||||
|
if [ "$major" -ge 4 ]; then
|
||||||
|
IFS=$'\r\n'
|
||||||
|
fi
|
||||||
|
fi
|
||||||
layers=( ${layersFs} )
|
layers=( ${layersFs} )
|
||||||
unset IFS
|
unset IFS
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue