Merge branch 'master' into v2

mgoltzsche · Oct 18, 2021 · d47df25 · d47df25
2 parents 7d3ee40 + 0c94b7a
commit d47df25
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -50,6 +50,7 @@ jobs:
 
     - name: Run GoReleaser
       uses: goreleaser/goreleaser-action@v2
+      if: startsWith(github.ref, 'refs/tags/')
       with:
         version: v0.182.1
         args: release --rm-dist

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,14 +6,17 @@ before:
 builds:
 - main: ./cmd/khelm
   targets:
-    - linux_amd64
-    - linux_arm64
-    - darwin_amd64
-    - darwin_arm64
+  - linux_amd64
+  - linux_arm64
+  - darwin_amd64
+  - darwin_arm64
   env:
-    - CGO_ENABLED=0
+  - CGO_ENABLED=0
   ldflags:
-    - -s -w -extldflags '-static' -X main.khelmVersion={{.Version}} -X main.helmVersion={{.Env.HELM_VERSION}}
+  - -s -w -extldflags '-static' -X main.khelmVersion={{.Version}} -X main.helmVersion={{.Env.HELM_VERSION}}
+archives:
+- format: binary
+  name_template: "{{.ProjectName}}-{{.Os}}-{{.Arch}}"
 checksum:
   name_template: 'checksums.txt'
 snapshot:

diff --git a/README.md b/README.md
@@ -101,11 +101,13 @@ Though plugin support in kustomize is still an alpha feature and may be removed
 
 #### Plugin installation
 
-Install using curl (linux amd64):
+Install using curl (on OSX or Linux):
 ```sh
+OS=$(uname | tr '[:upper:]' '[:lower:]')
+ARCH=$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')
 mkdir -p $HOME/.config/kustomize/plugin/khelm.mgoltzsche.github.com/v2/chartrenderer
-curl -fsSL https://github.com/mgoltzsche/khelm/releases/latest/download/khelm-linux-amd64 > $HOME/.config/kustomize/plugin/khelm.mgoltzsche.github.com/v2/chartrenderer/ChartRenderer
-chmod u+x $HOME/.config/kustomize/plugin/khelm.mgoltzsche.github.com/v2/chartrenderer/ChartRenderer
+curl -fsSL https://github.com/mgoltzsche/khelm/releases/latest/download/khelm-${OS}-${ARCH} > $HOME/.config/kustomize/plugin/khelm.mgoltzsche.github.com/v2/chartrenderer/ChartRenderer
+chmod +x $HOME/.config/kustomize/plugin/khelm.mgoltzsche.github.com/v2/chartrenderer/ChartRenderer
 ```
 or using `go`:
 ```sh
@@ -145,7 +147,9 @@ khelm also supports a helm-like `template` CLI.
 
 #### Binary installation
 ```sh
-curl -fsSL https://github.com/mgoltzsche/khelm/releases/latest/download/khelm-linux-amd64 > khelm
+OS=$(uname | tr '[:upper:]' '[:lower:]')
+ARCH=$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')
+curl -fsSL https://github.com/mgoltzsche/khelm/releases/latest/download/khelm-${OS}-${ARCH} > khelm
 chmod +x khelm
 sudo mv khelm /usr/local/bin/khelm
 ```