Commit5575515

committed

fix: installation script with curl 8.8.0

1 parent528d713 commit5575515Copy full SHA for 5575515

File tree

+36

-7

lines changed

+36

-7

lines changed

Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ on:`
`8`	`8`
`9`	`9`	`jobs:`
`10`	`10`
`11`		`-main:`
`12`		`-name:Main Process`
	`11`	`+check-code:`
	`12`	`+name:Check code`
`13`	`13`	`runs-on:ubuntu-latest`
`14`	`14`	`env:`
`15`	`15`	`GO_VERSION:stable`
`@@ -44,3 +44,13 @@ jobs:`
`44`	`44`
`45`	`45`	`-name:Make`
`46`	`46`	`run:make`
	`47`	`+`
	`48`	`+check-local-install-script:`
	`49`	`+name:Installation script (local)`
	`50`	`+strategy:`
	`51`	`+matrix:`
	`52`	`+os:[ubuntu-latest, macos-latest, windows-latest]`
	`53`	`+runs-on:${{ matrix.os }}`
	`54`	`+steps:`
	`55`	`+ -name:Check installation script`
	`56`	`+run:cat ./install-misspell.sh \| sh -s -- -d -b "./install-misspell"`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,12 @@ on:`
`5`	`5`	`-published`
`6`	`6`
`7`	`7`	`jobs:`
`8`		`-install:`
`9`		`-name:Install script`
	`8`	`+check-install-script:`
	`9`	`+name:Installation script (remote)`
`10`	`10`	`strategy:`
`11`	`11`	`matrix:`
`12`		`-os:[ubuntu-latest, macos-latest]`
`13`		-# os: [ubuntu-latest, macos-latest, windows-latest] # windows has a problem when curl use `%{http_code}`, it returns 000 instead of 200.
	`12`	`+os:[ubuntu-latest, macos-latest, windows-latest]`
`14`	`13`	`runs-on:${{ matrix.os }}`
`15`	`14`
`16`	`15`	`steps:`
`17`		`- -run:curl -sSfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh \| sh -s -- -b "./bin-misspell"`
	`16`	`+ -run:curl -sSfL https://raw.githubusercontent.com/golangci/misspell/master/install-misspell.sh \| sh -s -- -b "./install-misspell"`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,26 @@ http_download_curl() {`
`240`	`240`	`local_file=$1`
`241`	`241`	`source_url=$2`
`242`	`242`	`header=$3`
	`243`	`+`
	`244`	`+# workaround https://github.com/curl/curl/issues/13845`
	`245`	`+ curl_version=$(curl --version\| head -n 1\| awk'{ print $2 }')`
	`246`	`+if ["$curl_version"="8.8.0" ];then`
	`247`	`+ log_debug"http_download_curl curl$curl_version detected"`
	`248`	`+if [-z"$header" ];then`
	`249`	`+ curl -sL -o"$local_file""$source_url"`
	`250`	`+else`
	`251`	`+ curl -sL -H"$header" -o"$local_file""$source_url"`
	`252`	`+`
	`253`	`+ nf=$(cat"$local_file"\| jq -r'.error // ""')`
	`254`	`+if [!-z"$nf" ];then`
	`255`	`+ log_debug"http_download_curl received an error:$nf"`
	`256`	`+return 1`
	`257`	`+fi`
	`258`	`+fi`
	`259`	`+`
	`260`	`+return 0`
	`261`	`+fi`
	`262`	`+`
`243`	`263`	`if [-z"$header" ];then`
`244`	`264`	`code=$(curl -w'%{http_code}' -sL -o"$local_file""$source_url")`
`245`	`265`	`else`

Comments

(0)