Skip to content

Commit

Permalink
Merge branch 'main' into fix-default-fsgroup
Browse files Browse the repository at this point in the history
Signed-off-by: JesseBot <[email protected]>
  • Loading branch information
jessebot authored Nov 29, 2023
2 parents b3efb79 + b62953a commit d5a298d
Show file tree
Hide file tree
Showing 19 changed files with 862 additions and 677 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ assignees: ''

- `values.yaml`:

<!-- please keep the ```yaml part here, as it creates syntax highlighting to help with reading the file -->
```yaml
# paste your values.yaml (anonymize any sensitive data)
```
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ on:
- '.github/**'
- 'charts/**/README.md'
- 'CODE_OF_CONDUCT.md'
- 'CONTRIBUTING.md'
- 'LICENSE'
- 'README.md'

jobs:
lint-test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -28,7 +29,7 @@ jobs:
helm repo add bitnami https://charts.bitnami.com/bitnami
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.4.0
uses: helm/chart-testing-action@v2.6.1

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -44,7 +45,7 @@ jobs:
run: ct lint --target-branch ${{ github.event.repository.default_branch }}

- name: Create kind cluster
uses: helm/kind-action@v1.5.0
uses: helm/kind-action@v1.8.0
if: steps.list-changed.outputs.changed == 'true'

- name: Run chart-testing (install)
Expand Down
24 changes: 9 additions & 15 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@

name: Release Charts
# only run one instance of this workflow at a time
# ref: https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#concurrency
concurrency: chart_releaser

on:
push:
branches:
- main
paths-ignore:
- '.github/**'
- 'charts/**/README.md'
- 'LICENSE'
- 'README.md'
paths:
- 'charts/**'

jobs:
release:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Turnstyle
uses: softprops/turnstyle@v1
with:
continue-after-seconds: 180
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: actions/checkout@v4

- name: Fetch history
run: git fetch --prune --unshallow
Expand All @@ -44,6 +37,7 @@ jobs:
helm repo add bitnami https://charts.bitnami.com/bitnami
- name: Run chart-releaser
uses: helm/chart-releaser-action@v1.5.0
uses: helm/chart-releaser-action@v1.6.0
env:
CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
CR_GENERATE_RELEASE_NOTES: true
17 changes: 17 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Welcome

Thanks for considering a contribution to this Nextcloud repository run by the community! Please make sure you review the [Code of Conduct](./CODE_OF_CONDUCT.md) before proceeding, and keep in mind that this repository is run by volunteers.

# Pull Requests

Before submitting a feature or fix PR, please make sure the following are done:

1. Make sure all your commits are signed off. (Learn more the DCO [here](https://probot.github.io/apps/dco))
2. Any new or changed values are updated in the [values.yaml](./charts/nextcloud/values.yaml) and the [README.md](./charts/nextcloud/README.md)
3. Bump the `version` in the [Chart.yaml](./charts/nextcloud/Chart.yaml) according to [Semantic Versioning](https://semver.org) which uses the format `major.minor.patch`.

Then, please make sure you follow the [pull request template](.github/pull_request_template.md), so we can more quickly review.

# Issues

Please make sure you follow one of the [issue templates](.github/ISSUE_TEMPLATE) so we can better help troubleshoot with you.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ helm repo update
For more information, please checkout the chart level [README.md](./charts/nextcloud/README.md).

### Support and Contribution
Please also review the official [NextCloud Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/) before contributing.
This helm chart is community maintained, and not supported by Nextcloud GmbH. Please also review the official [NextCloud Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/) before contributing.

#### Questions and Discussions
[GitHub Discussion](https://github.com/nextcloud/helm/discussions)
Expand Down
16 changes: 8 additions & 8 deletions charts/nextcloud/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 11.6.26
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.12.10
- name: mariadb
repository: https://charts.bitnami.com/bitnami
version: 11.0.14
repository: oci://registry-1.docker.io/bitnamicharts
version: 12.2.9
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 16.12.3
digest: sha256:26d3436ece41f0fbe00d0184c1cda7f5cccb7d49642982cfff49f113c11c0f34
generated: "2022-10-30T11:48:19.745391397+01:00"
repository: oci://registry-1.docker.io/bitnamicharts
version: 17.13.2
digest: sha256:92fe0891c35c2586cfe3b76154412c188bb75cc0a687e1d771fc4c1cf0f8973d
generated: "2023-11-11T19:19:38.983179104+01:00"
16 changes: 8 additions & 8 deletions charts/nextcloud/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: nextcloud
version: 3.6.0
appVersion: 26.0.1
version: 4.6.0
appVersion: 27.1.3
description: A file sharing server that puts the control and security of your own data back into your hands.
keywords:
- nextcloud
Expand All @@ -23,14 +23,14 @@ maintainers:
email: [email protected]
dependencies:
- name: postgresql
version: 11.6.*
repository: https://charts.bitnami.com/bitnami
version: 12.12.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: postgresql.enabled
- name: mariadb
version: 11.0.*
repository: https://charts.bitnami.com/bitnami
version: 12.2.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: mariadb.enabled
- name: redis
version: 16.12.*
repository: https://charts.bitnami.com/bitnami
version: 17.13.*
repository: oci://registry-1.docker.io/bitnamicharts
condition: redis.enabled
Loading

0 comments on commit d5a298d

Please sign in to comment.