Skip to content

Commit

Permalink
Merge pull request #83 from ccremer/prepare
Browse files Browse the repository at this point in the history
Add prepare target for charts
  • Loading branch information
ccremer committed Jun 20, 2021
2 parents 91799fc + 11682fc commit 068106e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
run: |
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
- name: Prepare charts
run: make prepare
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.2.1
env:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@ jobs:
restore-keys: |
${{ runner.os }}-go-
- name: Prepare charts
run: make prepare
- name: Run Chart unit tests
run: make test
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,10 @@ lint\:versions: ## Checks if chart versions have been changed
@changed_charts=$$(git diff --dirstat=files,0 origin/master..HEAD -- charts | cut -d '/' -f 2 | uniq) ; \
echo "Charts changed: $$changed_charts" ; echo ; \
for dir in $$changed_charts; do git diff origin/master..HEAD -- "charts/$${dir}/Chart.yaml" | grep -H --label=$${dir} "+version"; done

.PHONY: prepare
prepare: ## Prepare the charts for testing
@echo --- Preparing charts
@find charts -type f -name Makefile | sed 's|/[^/]*$$||' | xargs -I '%' make -C '%' prepare
@echo 'Check for uncommitted changes ...'
git diff --exit-code
2 changes: 1 addition & 1 deletion charts/clustercode/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.1
version: 0.1.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
5 changes: 5 additions & 0 deletions charts/clustercode/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,8 @@ update: rbac appVersion ## Updates all templates
.PHONY: help
help: ## Show this help
@grep -E -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'

#
# "Interface" for parent Makefile
#
prepare: ## Prepare helm chart
2 changes: 1 addition & 1 deletion charts/clustercode/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# clustercode

![Version: 0.1.1](https://img.shields.io/badge/Version-0.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.0-rc2](https://img.shields.io/badge/AppVersion-v2.0.0--rc2-informational?style=flat-square)
![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.0.0-rc2](https://img.shields.io/badge/AppVersion-v2.0.0--rc2-informational?style=flat-square)

Movie and Series conversion Operator

Expand Down
8 changes: 8 additions & 0 deletions charts/fronius-stack/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

#
# "Interface" for parent Makefile
#
prepare: ## Prepare helm chart
helm repo add ccremer https://ccremer.github.io/charts
helm repo add influx https://helm.influxdata.com
helm dep build

0 comments on commit 068106e

Please sign in to comment.