Skip to content

Commit

Permalink
Task/app patch (#26)
Browse files Browse the repository at this point in the history
* evaluate input set

* rename label

* consistent naming convention
  • Loading branch information
felixZdi authored Apr 11, 2024
1 parent 7d320fa commit 106658a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/app_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
create_tag:
if: |
(github.event.pull_request.merged == true) &&
contains(github.event.pull_request.labels.*.name, 'helm_app_version_update')
contains(github.event.pull_request.labels.*.name, 'app-release')
runs-on: ubuntu-latest
outputs:
new_tag: ${{ steps.tag_version.outputs.new_tag }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
VERSION=noop
if [ "${{ github.event_name }}" = "schedule" ]; then
VERSION=edge
elif [[ "${{ github.event.workflow }}" = ".github/workflows/app_release.yml" ]]; then
elif [[ -n "${{ inputs.tag }}" ]]; then
VERSION=${{ inputs.tag }}
elif [[ $GITHUB_REF == refs/heads/* ]]; then
VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version_bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
sed -i "s/appVersion:.*/appVersion: $new_version/g" charts/ca-injector/Chart.yaml
echo "PR_LABELS=helm_app_version_update" >> $GITHUB_ENV
echo "PR_LABELS=app-release" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ or environment variable `CAINJECTOR_CABUNDLE_CRT`).
## Release

### App
To trigger a new tagged docker build, create a PR with label 'helm_app_version_update'. The app Version within the helm chart will be used as reference for the container tag.
To trigger a new tagged docker build, create a PR with label 'app-release'. The app Version within the helm chart will be used as reference for the container tag.
This will be done automatically by below mentioned workflow.

### Helm
Expand All @@ -92,5 +92,5 @@ Add one or two(app and helm) of the following labels to your PR:
- helm-minor
- helm-patch

According to the label, appVersion and/or helm version will be bumped and a PullRequest will be created. The Pull request will include label 'helm_app_version_update' to trigger above mentioned workflow. After this PR has benn closed, the Helm release workflow will create a new release in case the helm Chart version has changed.
According to the label, appVersion and/or helm version will be bumped and a PullRequest will be created. The Pull request will include label 'app-release' to trigger above mentioned workflow. After this PR has benn closed, the Helm release workflow will create a new release in case the helm Chart version has changed.

0 comments on commit 106658a

Please sign in to comment.