Ver Fonte

Merge pull request #18459 from Microsoft/jjh/winci-bash4fix

Windows CI Fix: Allow bash v4
David Calavera há 9 anos atrás
pai
commit
31a31adf7e
1 ficheiros alterados com 7 adições e 0 exclusões
  1. 7 0
      contrib/download-frozen-image-v2.sh

+ 7 - 0
contrib/download-frozen-image-v2.sh

@@ -56,6 +56,13 @@ while [ $# -gt 0 ]; do
 	layersFs=$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum')
 
 	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} )
 	unset IFS