Use linux image for docker (#60)

Signed-off-by: Marc Khouzam <marc.khouzam@montreal.ca>
helm · Nov 22, 2019 · 7319ea4 · 7319ea4
1 parent cbfff2c
commit 7319ea4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/scripts/completion-tests/test-completion.sh b/scripts/completion-tests/test-completion.sh
@@ -67,7 +67,7 @@ if [[ "${GITHUB_SHA}" == "" ]]; then
   cp ${CHECK_BINARY_PATH} ${COMP_DIR}/bin
 else
   echo "Running on GitHub Actions CI - using system-wide Helm 3 binary."
-  cp $(which helm) ${COMP_DIR}/bin
+  cp $(which helm-docker) ${COMP_DIR}/bin/helm
 fi
 
 # kubectl stub

diff --git a/scripts/github-actions-ci.sh b/scripts/github-actions-ci.sh
@@ -28,10 +28,11 @@ mkdir -p /tmp/gopath/src/helm.sh
 pushd /tmp/gopath/src/helm.sh
 git clone https://github.com/helm/helm.git -b master
 pushd helm/
-GOPATH=/tmp/gopath make build
+GOPATH=/tmp/gopath make build build-cross
 popd
 popd
 mv /tmp/gopath/src/helm.sh/helm/bin/helm bin/helm
+mv /tmp/gopath/src/helm.sh/helm/_dist/linux-amd64/helm bin/helm-docker
 helm version
 which helm
 
@@ -60,7 +61,7 @@ kubectl version --client
 which kubectl
 
 # Install kind
-which helm || true
+which kind || true
 curl -LO https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-linux-amd64
 chmod +x kind-linux-amd64
 mv kind-linux-amd64 bin/kind