Skip to content

Commit 3cd2f9d

Browse files
authored
cherrypick #58762 (#58814)
fix serve minbuild ci base image Signed-off-by: Lonnie Liu <[email protected]>
1 parent d72c20e commit 3cd2f9d

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ci/env/install-dependencies.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ install_shellcheck() {
7979
local name="shellcheck-v${shellcheck_version}"
8080
if [[ "${osname}" == "linux" || "${osname}" == "darwin" ]]; then
8181
sudo mkdir -p /usr/local/bin || true
82-
curl -f -s -L "https://github.com/koalaman/shellcheck/releases/download/v${shellcheck_version}/${name}.${osname}.x86_64.tar.xz" | {
82+
curl -sSfL "https://github.com/koalaman/shellcheck/releases/download/v${shellcheck_version}/${name}.${osname}.x86_64.tar.xz" | {
8383
sudo tar -C /usr/local/bin -x -v -J --strip-components=1 "${name}/shellcheck"
8484
}
8585
else
8686
mkdir -p /usr/local/bin
87-
curl -f -s -L -o "${name}.zip" "https://github.com/koalaman/shellcheck/releases/download/v${shellcheck_version}/${name}.zip"
87+
curl -sSfL -o "${name}.zip" "https://github.com/koalaman/shellcheck/releases/download/v${shellcheck_version}/${name}.zip"
8888
unzip "${name}.zip" "${name}.exe"
8989
mv -f "${name}.exe" "/usr/local/bin/shellcheck.exe"
9090
fi
@@ -108,7 +108,7 @@ install_nvm() {
108108
(
109109
cd "${NVM_HOME}"
110110
local target="./nvm-${ver}.zip"
111-
curl -f -s -L -o "${target}" \
111+
curl -sSfL -o "${target}" \
112112
"https://github.com/coreybutler/nvm-windows/releases/download/${ver}/nvm-noinstall.zip"
113113
unzip -q -- "${target}"
114114
rm -f -- "${target}"
@@ -156,13 +156,13 @@ install_node() {
156156
if [[ -n "${BUILDKITE-}" ]] ; then
157157
if [[ "${OSTYPE}" = darwin* ]]; then
158158
if [[ "$(uname -m)" == "arm64" ]]; then
159-
curl -sSL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
159+
curl -sSfL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.0/install.sh | bash
160160
else
161-
curl -sSL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
161+
curl -sSfL -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash
162162
fi
163163
else
164164
# https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
165-
curl -sSL https://deb.nodesource.com/setup_14.x | sudo -E bash -
165+
curl -sSfL https://deb.nodesource.com/setup_14.x | sudo -E bash -
166166
sudo apt-get install -y nodejs
167167
return
168168
fi

0 commit comments

Comments
 (0)