ci: install Helm with script located on GitHub

Installing Helm fails often in the CI. The Helm documentation does not
point to `https://git.io/get_helm.sh` anymore, but to a location on
GitHub. To make it easier to update the location in the future, it has
now been added to `build.env`, just like the `HELM_VERSION`.

See-also: https://helm.sh/docs/intro/install/
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-05-22 09:30:40 +02:00 committed by mergify[bot]
parent 1e2c01d24f
commit bc167cc6f4
3 changed files with 5 additions and 2 deletions

View File

@ -34,6 +34,9 @@ SNAPSHOT_VERSION=v6.1.0
#TEST_COVERAGE=html #TEST_COVERAGE=html
#GO_COVER_DIR=_output/ #GO_COVER_DIR=_output/
# URL for the script to install Helm
HELM_SCRIPT=https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
# helm chart generation, testing and publishing # helm chart generation, testing and publishing
HELM_VERSION=v3.10.1 HELM_VERSION=v3.10.1

View File

@ -104,7 +104,7 @@ CSI_CHARTS_DIR=$(mktemp -d)
pushd "${CSI_CHARTS_DIR}" >/dev/null pushd "${CSI_CHARTS_DIR}" >/dev/null
curl -L https://git.io/get_helm.sh | bash -s -- --version "${HELM_VERSION}" curl -L "${HELM_SCRIPT}" | bash -s -- --version "${HELM_VERSION}"
build_step "cloning ceph/csi-charts repository" build_step "cloning ceph/csi-charts repository"
git clone https://github.com/ceph/csi-charts git clone https://github.com/ceph/csi-charts

View File

@ -50,7 +50,7 @@ RUN source /build.env \
| tar xzf - -C ${GOROOT} --strip-components=1 \ | tar xzf - -C ${GOROOT} --strip-components=1 \
&& curl -sf "https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCI_VERSION}/install.sh" \ && curl -sf "https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCI_VERSION}/install.sh" \
| bash -s -- -b ${GOPATH}/bin "${GOLANGCI_VERSION}" \ | bash -s -- -b ${GOPATH}/bin "${GOLANGCI_VERSION}" \
&& curl -L https://git.io/get_helm.sh | bash -s -- --version "${HELM_VERSION}" \ && curl -L "${HELM_SCRIPT}" | bash -s -- --version "${HELM_VERSION}" \
&& mkdir /opt/commitlint && pushd /opt/commitlint \ && mkdir /opt/commitlint && pushd /opt/commitlint \
&& npm init -y \ && npm init -y \
&& npm install @commitlint/cli@"${COMMITLINT_VERSION}" \ && npm install @commitlint/cli@"${COMMITLINT_VERSION}" \