Skip to content

Commit c7c886e

Browse files
Merge branch 'main' into dependabot/github_actions/azure/setup-helm-4
2 parents 95c0875 + 97f98c6 commit c7c886e

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.github/workflows/lint-test.yaml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,29 @@ name: Lint and Test Charts
22

33
on:
44
pull_request:
5-
paths-ignore:
6-
- '.github/**'
7-
- 'charts/**/README.md'
8-
- 'CODE_OF_CONDUCT.md'
9-
- 'CONTRIBUTING.md'
10-
- 'LICENSE'
11-
- 'README.md'
12-
5+
paths:
136
jobs:
7+
changes:
8+
runs-on: ubuntu-latest-low
9+
10+
outputs:
11+
src: ${{ steps.changes.outputs.src}}
12+
13+
steps:
14+
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
15+
id: changes
16+
continue-on-error: true
17+
with:
18+
filters: |
19+
src:
20+
- 'charts/nextcloud/Chart.yaml'
21+
- 'charts/nextcloud/values.yaml'
22+
- 'charts/nextcloud/templates/**'
23+
1424
lint-test:
1525
runs-on: ubuntu-22.04
26+
needs: changes
27+
if: needs.changes.outputs.src != 'false'
1628
steps:
1729
- name: Checkout
1830
uses: actions/checkout@v4
@@ -45,7 +57,7 @@ jobs:
4557
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
4658

4759
- name: Create kind cluster
48-
uses: helm/kind-action@v1.8.0
60+
uses: helm/kind-action@v1.10.0
4961
if: steps.list-changed.outputs.changed == 'true'
5062

5163
- name: Run chart-testing (install)

charts/nextcloud/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: nextcloud
3-
version: 4.6.7
3+
version: 4.6.8
44
appVersion: 29.0.0
55
description: A file sharing server that puts the control and security of your own data back into your hands.
66
keywords:

charts/nextcloud/templates/secrets.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ data:
1717
{{- else }}
1818
nextcloud-password: {{ randAlphaNum 10 | b64enc | quote }}
1919
{{- end }}
20-
{{- with .Values.metrics.token }}
21-
nextcloud-token: {{ . | b64enc | quote }}
22-
{{- else }}
20+
{{- if and .Values.metrics.enabled .Values.metrics.token }}
21+
nextcloud-token: {{ .Values.metrics.token | b64enc | quote }}
22+
{{- else if and .Values.metrics.enabled (not .Values.metrics.token) }}
2323
nextcloud-token: {{ randAlphaNum 10 | b64enc | quote }}
2424
{{- end }}
2525
{{- if .Values.nextcloud.mail.enabled }}

0 commit comments

Comments
 (0)