Merge pull request #131 from ccremer/ci-cd

Update CI/CD
ccremer · Jul 19, 2023 · 67d7477 · 67d7477
2 parents e521659 + d8bf551
commit 67d7477
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 23 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,17 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
-      - uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
       - name: Lint unit tests
         run: make lint
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,19 +9,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - uses: azure/setup-helm@v1
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
 
       - name: Prepare charts
         run: make prepare

diff --git a/.helmdocsignore b/.helmdocsignore
@@ -0,0 +1 @@
+charts/znapzend
diff --git a/Makefile b/Makefile
@@ -11,6 +11,8 @@ SOURCE_README=README.gotmpl
 TARGET_README=README.md
 CHARTS_DIR=charts/
 
+HELMDOCS_VERSION=v1.11.0
+
 go_cmd ?= docker run --rm -v $$(pwd):/go/src -u $$(id -u):$$(id -g) -e GOCACHE=/go/.cache/go-build -w /go/src bitnami/golang go
 
 .PHONY: help
@@ -23,7 +25,7 @@ docs: docs\:helm docs\:readme
 .PHONY: docs\:helm
 docs\:helm: ## Creates the Chart READMEs from template and values.yaml files
 	@echo --- Generating Chart READMEs
-	@docker run --rm -v $$(pwd):/helm-docs -u $$(id -u) jnorwood/helm-docs:v1.5.0 \
+	@docker run --rm -v $$(pwd):/helm-docs -u $$(id -u) jnorwood/helm-docs:${HELMDOCS_VERSION} \
 		--template-files ./.github/helm-docs-header.gotmpl.md \
 		--template-files README.gotmpl.md \
 		--template-files ./.github/helm-docs-footer.gotmpl.md