Skip to content

Commit 8b469b4

Browse files
authored
Merge branch 'main' into fix/ct-values-first
Signed-off-by: Jesse Hitch <jessebot@linux.com>
2 parents a323f84 + ddf49e9 commit 8b469b4

14 files changed

Lines changed: 266 additions & 114 deletions

File tree

.github/workflows/lint-test.yaml

Lines changed: 95 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,39 @@ 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:
14-
lint-test:
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+
24+
lint:
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
1931
with:
2032
fetch-depth: 0
2133

2234
- name: Install Helm
23-
uses: azure/setup-helm@v3.5
35+
uses: azure/setup-helm@v4
2436
with:
25-
version: v3.11.1
37+
version: v3.14.4
2638

2739
- name: Add dependency chart repos
2840
run: |
@@ -44,11 +56,82 @@ jobs:
4456
if: steps.list-changed.outputs.changed == 'true'
4557
run: ct lint --target-branch ${{ github.event.repository.default_branch }}
4658

59+
test-internal-database:
60+
runs-on: ubuntu-22.04
61+
needs: [changes, lint]
62+
if: needs.changes.outputs.src != 'false'
63+
steps:
64+
- name: Checkout
65+
uses: actions/checkout@v4
66+
with:
67+
fetch-depth: 0
68+
69+
- name: Install Helm
70+
uses: azure/setup-helm@v4
71+
with:
72+
version: v3.14.4
73+
74+
- name: Add dependency chart repos
75+
run: |
76+
helm repo add bitnami https://charts.bitnami.com/bitnami
77+
78+
- name: Set up chart-testing
79+
uses: helm/chart-testing-action@v2.6.1
80+
81+
- name: Run chart-testing (list-changed)
82+
id: list-changed
83+
run: |
84+
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
85+
if [[ -n "$changed" ]]; then
86+
echo "changed=true" >> "$GITHUB_OUTPUT"
87+
fi
88+
4789
- name: Create kind cluster
48-
uses: helm/kind-action@v1.8.0
90+
uses: helm/kind-action@v1.10.0
4991
if: steps.list-changed.outputs.changed == 'true'
5092

5193
- name: Run chart-testing (install)
5294
id: install
5395
if: steps.list-changed.outputs.changed == 'true'
5496
run: ct install --target-branch ${{ github.event.repository.default_branch }}
97+
98+
test-postgresql-database:
99+
runs-on: ubuntu-22.04
100+
needs: [changes, lint]
101+
if: needs.changes.outputs.src != 'false'
102+
steps:
103+
- name: Checkout
104+
uses: actions/checkout@v4
105+
with:
106+
fetch-depth: 0
107+
108+
- name: Install Helm
109+
uses: azure/setup-helm@v4
110+
with:
111+
version: v3.14.4
112+
113+
- name: Add dependency chart repos
114+
run: |
115+
helm repo add bitnami https://charts.bitnami.com/bitnami
116+
117+
- name: Set up chart-testing
118+
uses: helm/chart-testing-action@v2.6.1
119+
120+
- name: Run chart-testing (list-changed)
121+
id: list-changed
122+
run: |
123+
changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
124+
if [[ -n "$changed" ]]; then
125+
echo "changed=true" >> "$GITHUB_OUTPUT"
126+
fi
127+
128+
- name: Create kind cluster
129+
uses: helm/kind-action@v1.10.0
130+
if: steps.list-changed.outputs.changed == 'true'
131+
132+
- name: Run chart-testing (install)
133+
id: install
134+
if: steps.list-changed.outputs.changed == 'true'
135+
run: |
136+
ct install --target-branch ${{ github.event.repository.default_branch }} \
137+
--helm-extra-set-args "--set=postgresql.enabled=true --set=postgresql.global.postgresql.auth.password=testing123456 --set=internalDatabase.enabled=false --set=externalDatabase.enabled=True --set=externalDatabase.type=postgresql --set=externalDatabase.password=testing123456"

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ jobs:
2828
2929
# See https://github.com/helm/chart-releaser-action/issues/6
3030
- name: Set up Helm
31-
uses: azure/setup-helm@v3.5
31+
uses: azure/setup-helm@v4
3232
with:
33-
version: v3.11.1
33+
version: v3.14.4
3434

3535
- name: Add dependency chart repos
3636
run: |

charts/nextcloud/Chart.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
dependencies:
22
- name: postgresql
33
repository: oci://registry-1.docker.io/bitnamicharts
4-
version: 12.12.10
4+
version: 15.5.0
55
- name: mariadb
66
repository: oci://registry-1.docker.io/bitnamicharts
7-
version: 12.2.9
7+
version: 18.2.0
88
- name: redis
99
repository: oci://registry-1.docker.io/bitnamicharts
10-
version: 17.13.2
11-
digest: sha256:92fe0891c35c2586cfe3b76154412c188bb75cc0a687e1d771fc4c1cf0f8973d
12-
generated: "2023-11-11T19:19:38.983179104+01:00"
10+
version: 19.5.0
11+
digest: sha256:4efc098feeb7f4486b7166f1c71b9c54bfee0797663a3339f379d397297303c7
12+
generated: "2024-06-03T09:51:56.321676+02:00"

charts/nextcloud/Chart.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
22
name: nextcloud
3-
version: 4.6.3
4-
appVersion: 28.0.2
3+
version: 5.2.3
4+
appVersion: 29.0.3
55
description: A file sharing server that puts the control and security of your own data back into your hands.
66
keywords:
77
- nextcloud
@@ -23,14 +23,14 @@ maintainers:
2323
email: jeff@billimek.com
2424
dependencies:
2525
- name: postgresql
26-
version: 12.12.*
26+
version: 15.5.0
2727
repository: oci://registry-1.docker.io/bitnamicharts
2828
condition: postgresql.enabled
2929
- name: mariadb
30-
version: 12.2.*
30+
version: 18.2.0
3131
repository: oci://registry-1.docker.io/bitnamicharts
3232
condition: mariadb.enabled
3333
- name: redis
34-
version: 17.13.*
34+
version: 19.5.0
3535
repository: oci://registry-1.docker.io/bitnamicharts
3636
condition: redis.enabled

0 commit comments

Comments
 (0)