Skip to content

Commit d647b00

Browse files
authored
Merge pull request #622 from element-hq/bbz/sort-source-fragments
CI: sort and ensure uniqeness of source_fragments
2 parents 7b9d790 + 88d4961 commit d647b00

47 files changed

Lines changed: 47 additions & 46 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

charts/matrix-stack/ci/element-web-checkov-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: element-web-minimal.yaml element-web-checkov.yaml
5+
# source_fragments: element-web-checkov.yaml element-web-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# initSecrets, postgres don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/example-default-enabled-components-checkov-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: deployment-markers-minimal.yaml deployment-markers-checkov.yaml element-web-minimal.yaml element-web-checkov.yaml synapse-minimal.yaml synapse-checkov.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-checkov.yaml init-secrets-minimal.yaml init-secrets-checkov.yaml postgres-minimal.yaml postgres-checkov.yaml well-known-minimal.yaml haproxy-checkov.yaml
5+
# source_fragments: deployment-markers-checkov.yaml deployment-markers-minimal.yaml element-web-checkov.yaml element-web-minimal.yaml haproxy-checkov.yaml init-secrets-checkov.yaml init-secrets-minimal.yaml matrix-authentication-service-checkov.yaml matrix-authentication-service-minimal.yaml postgres-checkov.yaml postgres-minimal.yaml synapse-checkov.yaml synapse-minimal.yaml well-known-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# wellKnownDelegation don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/example-default-enabled-components-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: deployment-markers-minimal.yaml element-web-minimal.yaml synapse-minimal.yaml matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml well-known-minimal.yaml
5+
# source_fragments: deployment-markers-minimal.yaml element-web-minimal.yaml init-secrets-minimal.yaml matrix-authentication-service-minimal.yaml postgres-minimal.yaml synapse-minimal.yaml well-known-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# deploymentMarkers, initSecrets, postgres, wellKnownDelegation don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/matrix-authentication-service-checkov-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-checkov.yaml init-secrets-minimal.yaml init-secrets-checkov.yaml postgres-minimal.yaml postgres-checkov.yaml
5+
# source_fragments: init-secrets-checkov.yaml init-secrets-minimal.yaml matrix-authentication-service-checkov.yaml matrix-authentication-service-minimal.yaml postgres-checkov.yaml postgres-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
deploymentMarkers:

charts/matrix-stack/ci/matrix-authentication-service-external-synapse-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-external-synapse.yaml init-secrets-minimal.yaml postgres-minimal.yaml
5+
# source_fragments: init-secrets-minimal.yaml matrix-authentication-service-external-synapse.yaml matrix-authentication-service-minimal.yaml postgres-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# initSecrets, postgres don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/matrix-authentication-service-minimal-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml init-secrets-minimal.yaml postgres-minimal.yaml
5+
# source_fragments: init-secrets-minimal.yaml matrix-authentication-service-minimal.yaml postgres-minimal.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# initSecrets, postgres don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-externally-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-secrets-externally.yaml postgres-matrix-authentication-service-secrets-externally.yaml init-secrets-disabled.yaml
5+
# source_fragments: init-secrets-disabled.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-matrix-authentication-service-secrets-externally.yaml postgres-secrets-externally.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
deploymentMarkers:

charts/matrix-stack/ci/matrix-authentication-service-postgres-secrets-in-helm-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-secrets-in-helm.yaml postgres-matrix-authentication-service-secrets-in-helm.yaml init-secrets-disabled.yaml
5+
# source_fragments: init-secrets-disabled.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-secrets-externally.yaml postgres-matrix-authentication-service-secrets-in-helm.yaml postgres-secrets-in-helm.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
deploymentMarkers:

charts/matrix-stack/ci/matrix-authentication-service-secrets-externally-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-additional-secrets-externally.yaml matrix-authentication-service-postgres.yaml matrix-authentication-service-postgres-secrets-externally.yaml matrix-authentication-service-secrets-externally.yaml
5+
# source_fragments: matrix-authentication-service-additional-secrets-externally.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-postgres-secrets-externally.yaml matrix-authentication-service-postgres.yaml matrix-authentication-service-secrets-externally.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# initSecrets, postgres don't have any required properties to be set and defaults to enabled

charts/matrix-stack/ci/matrix-authentication-service-secrets-in-helm-values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: AGPL-3.0-only
44
#
5-
# source_fragments: matrix-authentication-service-minimal.yaml matrix-authentication-service-postgres.yaml matrix-authentication-service-additional-in-helm.yaml matrix-authentication-service-postgres.yaml matrix-authentication-service-postgres-secrets-in-helm.yaml matrix-authentication-service-secrets-in-helm.yaml
5+
# source_fragments: matrix-authentication-service-additional-in-helm.yaml matrix-authentication-service-minimal.yaml matrix-authentication-service-postgres-secrets-in-helm.yaml matrix-authentication-service-postgres.yaml matrix-authentication-service-secrets-in-helm.yaml
66
# DO NOT EDIT DIRECTLY. Edit the fragment files to add / modify / remove values
77

88
# initSecrets, postgres don't have any required properties to be set and defaults to enabled

0 commit comments

Comments
 (0)