Skip to content

Commit

Permalink
Merge branch 'master' into aslafy-z-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
karl-johan-grahn committed Sep 11, 2024
2 parents 64efb14 + fa45126 commit ac6353c
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Push

concurrency:
concurrency:
group: push_on_master
cancel-in-progress: false

Expand All @@ -10,7 +10,7 @@ on:
- master
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'LICENSE'

env:
CHART_NAME: "application"
Expand All @@ -20,7 +20,7 @@ jobs:
name: helm-dry-run
if: "! contains(toJSON(github.event.commits.*.message), '[skip-ci]')"
runs-on: stakater-nonprod

steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
runs-on: ubuntu-latest
needs:
- helm-dry-run

steps:
- name: Check out code
uses: actions/checkout@v4
Expand Down Expand Up @@ -118,11 +118,11 @@ jobs:
branch: master
repository: stakater-charts
target_dir: docs
token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
token: ${{ secrets.PUBLISH_TOKEN }}
charts_dir: .
charts_url: https://stakater.github.io/stakater-charts
owner: stakater
linting: off
linting: off
commit_username: stakater-user
commit_email: [email protected]

Expand All @@ -131,21 +131,21 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "stakater-user"
git status
git status
git add application/Chart.yaml
git commit -m "[skip-ci] Update artifacts"
git commit -m "[skip-ci] Update artifacts"
# Push Chart.yaml with Updated Version
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.STAKATER_GITHUB_TOKEN }}
github_token: ${{ secrets.PUBLISH_TOKEN }}
branch: ${{ inputs.RELEASE_BRANCH }}

- name: Push Latest Tag
uses: anothrNick/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.STAKATER_GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
WITH_V: true
DEFAULT_BUMP: patch

Expand Down
2 changes: 1 addition & 1 deletion application/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ type: application

# Helm chart Version

version: 4.2.6
version: 4.2.7


keywords:
Expand Down
2 changes: 2 additions & 0 deletions application/templates/backup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ kind: Backup
metadata:
name: {{ printf "%s-backup" .Values.applicationName | trunc 63 | quote }}
namespace: {{ .Values.backup.namespace | default ( include "application.namespace" . ) | quote }}
labels:
{{- include "application.labels" . | nindent 4 }}
spec:
labelSelector:
matchLabels:
Expand Down

0 comments on commit ac6353c

Please sign in to comment.