Skip to content

Commit 75909f9

Browse files
committed
Merge #3 Central customization setup
2 parents 0057237 + 63262d7 commit 75909f9

File tree

5 files changed

+1433
-198
lines changed

5 files changed

+1433
-198
lines changed
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
###
2+
# SPDX-License-Identifier: AGPL-3.0
3+
#
4+
# Author: Bernd rederlechner <bernd.rederlechner@t-systems.com>
5+
#
6+
# Builds a stable release package based on a release assembly
7+
# customisation-<version>-<increment>
8+
#
9+
# As soon as a package is deployed to production, the tag and the branch
10+
# MUST STAY FOR 2 years and not deleted.
11+
#
12+
# Release packages, tags and customisation branches not delivered to production should
13+
# be deleted asap a newer release is available.
14+
#
15+
16+
name: MCLOUD custom app release
17+
18+
on:
19+
workflow_dispatch:
20+
inputs:
21+
increment:
22+
description: 'Release increment'
23+
required: true
24+
type: number
25+
26+
jobs:
27+
check-custom:
28+
uses: nextmcloud/.github/.github/workflows/nmc-custom-app-precond.yml@master
29+
with:
30+
versionbranch: ${{ vars.CUSTOM_BRANCH || 'nmcstable/25.0.6' }}
31+
increment: ${{ inputs.increment }}
32+
secrets: inherit
33+
assemble-custom:
34+
uses: nextmcloud/.github/.github/workflows/nmc-custom-assembly.yml@master
35+
with:
36+
trunk: 'main'
37+
stable: ${{ vars.CUSTOM_BRANCH || 'nmcstable/25.0.6' }}
38+
result: ${{ format('customisation-{0}-{1}', vars.CUSTOM_BRANCH || jobs.check-custom.appversion , inputs.increment ) }}
39+
secrets: inherit
40+
build-custom:
41+
uses: nextmcloud/.github/.github/workflows/nmc-custom-app-build.yml@master
42+
needs: assemble-custom
43+
with:
44+
appname: ${{ jobs.check-custom.appname }}
45+
stable: ${{ vars.CUSTOM_BRANCH || 'nmcstable/25.0.6' }}
46+
assembly: ${{ format('customisation-{0}-{1}', vars.CUSTOM_BRANCH || jobs.check-custom.appversion , inputs.increment ) }}
47+
tag: ${{ jobs.check-custom.tag }}
48+
prerelease: true
49+
secrets: inherit
50+
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
###
2+
# SPDX-License-Identifier: AGPL-3.0
3+
#
4+
# Author: Bernd rederlechner <bernd.rederlechner@t-systems.com>
5+
#
6+
# Assemble a customisation for trunk (no backports) and stable
7+
# (backport xor trunk)
8+
#
9+
# It creates review (user-specific) customisations branches
10+
# - customisation-<user>-<trunk>
11+
# - customisation-<user>-<stable>
12+
13+
name: MCLOUD custom app versions
14+
15+
on:
16+
workflow_dispatch:
17+
18+
jobs:
19+
build-custom:
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
custombase: [ "main", "nmcstable/25.0.6" ]
24+
uses: nextmcloud/.github/.github/workflows/nmc-custom-assembly.yml@master
25+
with:
26+
trunk: "master"
27+
stable: ${{ matrix.custombase }}
28+
result: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }}
29+
secrets: inherit

COPYING.DTAG

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Although this Nextcloud app code is free and available under the AGPL3 license, Deutsche Telekom
2+
(including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
3+
the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
4+
even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
5+
replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.

composer.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@
2929
]
3030
},
3131
"require": {
32+
"web-token/jwt-core": "^2.0",
33+
"web-token/jwt-encryption": "^2.2",
34+
"web-token/jwt-signature": "^2.2",
35+
"web-token/jwt-encryption-algorithm-aescbc": "^2.2",
36+
"web-token/jwt-encryption-algorithm-ecdh-es": "^2.2",
37+
"web-token/jwt-encryption-algorithm-rsa": "^2.2",
38+
"web-token/jwt-encryption-algorithm-pbes2": "^2.2",
39+
"web-token/jwt-signature-algorithm-hmac": "^2.2",
40+
"web-token/jwt-signature-algorithm-rsa": "^2.2",
41+
"web-token/jwt-util-ecc": "^2.2",
3242
"id4me/id4me-rp": "^1.2",
3343
"firebase/php-jwt": "^5.2",
3444
"bamarni/composer-bin-plugin": "^1.4"

0 commit comments

Comments
 (0)