From dca04452e94e4e1ebdbd1ec2ae1ee68e1d2d412e Mon Sep 17 00:00:00 2001
From: YuviPanda <yuvipanda@gmail.com>
Date: Sun, 21 Jan 2024 14:02:20 -0800
Subject: [PATCH] Use setup-helm action to install helm

This reduces overall custom bash code we maintain, which is
great!
---
 .github/workflows/publish.yml | 9 ++++++---
 ci/common                     | 6 ------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ed6ab88b9..66463ea2d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -55,10 +55,13 @@ jobs:
       - name: Set up Docker Buildx (for chartpress multi-arch builds)
         uses: docker/setup-buildx-action@v3
 
-      - name: Install chart publishing dependencies (chartpress, helm)
+      - name: Setup helm
+        uses: azure/setup-helm@v3
+        with:
+          version: "v3.5.4"
+
+      - name: Install chart publishing dependencies (chartpress, etc)
         run: |
-          . ./ci/common
-          setup_helm v3.5.4
           pip install --no-cache-dir chartpress>=2.1 pyyaml build
 
       - name: Build binderhub wheel
diff --git a/ci/common b/ci/common
index c0b1eddca..37e2b492b 100755
--- a/ci/common
+++ b/ci/common
@@ -1,12 +1,6 @@
 #!/bin/sh
 # Use https://www.shellcheck.net/ to reduce mistakes if you make changes to this file.
 
-setup_helm() {
-    helm_version="${1}"
-    echo "setup helm ${helm_version}"
-    curl -sf https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | DESIRED_VERSION="${helm_version}" bash
-}
-
 await_jupyterhub() {
     kubectl rollout status --watch --timeout 300s deployment/proxy \
  && kubectl rollout status --watch --timeout 300s deployment/hub \