From 56fb1cba9601fdbc19a6796cf4eddf1e85b5fb08 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Mon, 10 Jul 2023 17:09:32 +0200 Subject: [PATCH 01/14] Override upstream Readme in .github --- .github/README.md | 56 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 .github/README.md diff --git a/.github/README.md b/.github/README.md new file mode 100644 index 00000000..76c7b0ac --- /dev/null +++ b/.github/README.md @@ -0,0 +1,56 @@ +# user_oidc: Customisation of OpenID app for MagentaCLOUD + +The app extends the standard `user_oidc` Nextcloud app, +see [upstream configuration hints for basic setup](https://github.com/nextcloud/user_oidc/README.md) + +The app is extended by the following features + +## Event-based provisioning (upstream contribution candidate) +The mechanism allows to implement custom puser provisioning logic in a separate Nextcloud app by +registering and handling a attribute change and provisioning event: + +``` +use OCP\AppFramework\App; +use OCP\AppFramework\Bootstrap\IBootContext; +use OCP\AppFramework\Bootstrap\IBootstrap; +use OCP\AppFramework\Bootstrap\IRegistrationContext; + +class Application extends App implements IBootstrap { +... + public function register(IRegistrationContext $context): void { + $context->registerEventListener(AttributeMappedEvent::class, MyUserAttributeListener::class); + $context->registerEventListener(UserAccountChangeEvent::class, MyUserAccountChangeListener::class); + } +... +} +``` +The provisioning handler should return a `OCA\UserOIDC\Event\UserAccountChangeResult` object + +## Telekom-specific bearer token + +Due to historic reason, Telekom bearer tokens have a close to standard structure, but +require special security implementation in detail. The customisation overrides te standard + + +### Requiring web-token libraries +The central configuration branch `nmc/2372-central-setup` automatic merge will frequently fail if composer +upstream + +The fast and easy way to bring it back to sync with upstream is: +``` +git checkout nmc/2372-central-setup +git rebase --onto main nmc/2372-central-setup +# manually take over everything from upstream for composer.lock (TODO: automate that) + +# update web-token dependencies in composer.lock +composer update web-token +``` +It is recommended to leave the version management for all other libraries to upstream +and only update web-token with the dedicated `composer update web-token`. + + +### Configuring an additional Bearer preshared secret with provider +TODO + +### Testing Bearer secrets +TODO \ No newline at end of file From 0d4fb92a291d481cf1291de42bc36c48965c8ea6 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Mon, 10 Jul 2023 17:18:04 +0200 Subject: [PATCH 02/14] Correct some wordings --- .github/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/README.md b/.github/README.md index 76c7b0ac..cc522ede 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,9 +1,11 @@ -# user_oidc: Customisation of OpenID app for MagentaCLOUD +# MagentaCLOUD user_oidc + +Customisation of the Nextcloud delivered OpenID connect app for MagentaCLOUD. The app extends the standard `user_oidc` Nextcloud app, -see [upstream configuration hints for basic setup](https://github.com/nextcloud/user_oidc/README.md) +see [upstream configuration hints for basic setup](https://github.com/nextcloud/user_oidc/blob/main/README.md) -The app is extended by the following features +The app is extended by the following features: ## Event-based provisioning (upstream contribution candidate) The mechanism allows to implement custom puser provisioning logic in a separate Nextcloud app by From cf631b60067cdd8d4c33de20f4b28f894a28f2f0 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Tue, 11 Jul 2023 18:06:01 +0200 Subject: [PATCH 03/14] Add automatic phpunit run after assembly --- .github/workflows/nmc-custom-phpunit.yml | 39 ++++++++++++++++++++ .github/workflows/nmc-custom-versions.yml | 43 +++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 .github/workflows/nmc-custom-phpunit.yml create mode 100644 .github/workflows/nmc-custom-versions.yml diff --git a/.github/workflows/nmc-custom-phpunit.yml b/.github/workflows/nmc-custom-phpunit.yml new file mode 100644 index 00000000..ab230b4b --- /dev/null +++ b/.github/workflows/nmc-custom-phpunit.yml @@ -0,0 +1,39 @@ +### +# SPDX-License-Identifier: AGPL-3.0 +# +# Author: Bernd rederlechner +# +# Assemble a customisation for trunk (no backports) and stable +# (backport xor trunk) +# +# It creates review (user-specific) customisations branches +# - customisation-- +# - customisation-- + +name: MCLOUD phpunit (customisation change) + +### +# The automated unittets cycles are started as soon as a new +# customisation branch is pushed +on: + push: + branches: + - customisation-*master + - customisation-*nmcstable/** + +jobs: + build-custom: + strategy: + fail-fast: false + matrix: + phpversion: ['8.0', '8.1'] + database: ['mysql'] + custombase: [ "main", "nmcstable/25.0.6" ] + uses: nextmcloud/.github/.github/workflows/nmc-custom-app-phpunit.yml@master + with: + assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + appname: 'user_oidc' + server-branch: ${{ matrix.custombase }} + phpversion: ${{ matrix.phpversion }} + database: ${{ matrix.database }} + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-versions.yml new file mode 100644 index 00000000..63579131 --- /dev/null +++ b/.github/workflows/nmc-custom-versions.yml @@ -0,0 +1,43 @@ +### +# SPDX-License-Identifier: AGPL-3.0 +# +# Author: Bernd rederlechner +# +# Assemble a customisation for trunk (no backports) and stable +# (backport xor trunk) +# +# It creates review (user-specific) customisations branches +# - customisation-- +# - customisation-- + +name: MCLOUD custom app versions + +### +# The customisation-* branches are always reassembled if a customisation branch +# is updated or included into a custom PR +on: + workflow_dispatch: + pull_request: + types: + - opened + - reopened + - synchronize + branches: + - master + - main + - trunk + - nmcstable/** + # - stable/** + +jobs: + build-custom: + strategy: + fail-fast: false + matrix: + custombase: [ "main", "nmcstable/25.0.6" ] + uses: nextmcloud/.github/.github/workflows/nmc-custom-assembly.yml@master + with: + trunk: "main" + stable: ${{ matrix.custombase }} + result: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + secrets: inherit From 38ef829285f314bebf9f400342c9a96a4cb3d71d Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Tue, 11 Jul 2023 18:19:30 +0200 Subject: [PATCH 04/14] Correct trunk name for customisation branch --- .github/workflows/nmc-custom-phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nmc-custom-phpunit.yml b/.github/workflows/nmc-custom-phpunit.yml index ab230b4b..76e04740 100644 --- a/.github/workflows/nmc-custom-phpunit.yml +++ b/.github/workflows/nmc-custom-phpunit.yml @@ -18,8 +18,8 @@ name: MCLOUD phpunit (customisation change) on: push: branches: - - customisation-*master - - customisation-*nmcstable/** + - customisation-*-main + - customisation-*-nmcstable/** jobs: build-custom: From b46a89714236dc11c451ace1a7b803774dc64a78 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Tue, 11 Jul 2023 18:37:51 +0200 Subject: [PATCH 05/14] Debug scheduling on push --- .github/workflows/nmc-custom-phpunit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nmc-custom-phpunit.yml b/.github/workflows/nmc-custom-phpunit.yml index 76e04740..1d5426f3 100644 --- a/.github/workflows/nmc-custom-phpunit.yml +++ b/.github/workflows/nmc-custom-phpunit.yml @@ -18,8 +18,8 @@ name: MCLOUD phpunit (customisation change) on: push: branches: - - customisation-*-main - - customisation-*-nmcstable/** + - 'customisation*-main' + - 'customisation*-nmcstable/25.0.6' jobs: build-custom: From b93100d243d7ff0b16929d816934b8c0352107e1 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Wed, 12 Jul 2023 08:50:24 +0200 Subject: [PATCH 06/14] Include phpunit in versions assembling --- .github/workflows/nmc-custom-phpunit.yml | 39 ----------------------- .github/workflows/nmc-custom-versions.yml | 20 +++++++++++- 2 files changed, 19 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/nmc-custom-phpunit.yml diff --git a/.github/workflows/nmc-custom-phpunit.yml b/.github/workflows/nmc-custom-phpunit.yml deleted file mode 100644 index 1d5426f3..00000000 --- a/.github/workflows/nmc-custom-phpunit.yml +++ /dev/null @@ -1,39 +0,0 @@ -### -# SPDX-License-Identifier: AGPL-3.0 -# -# Author: Bernd rederlechner -# -# Assemble a customisation for trunk (no backports) and stable -# (backport xor trunk) -# -# It creates review (user-specific) customisations branches -# - customisation-- -# - customisation-- - -name: MCLOUD phpunit (customisation change) - -### -# The automated unittets cycles are started as soon as a new -# customisation branch is pushed -on: - push: - branches: - - 'customisation*-main' - - 'customisation*-nmcstable/25.0.6' - -jobs: - build-custom: - strategy: - fail-fast: false - matrix: - phpversion: ['8.0', '8.1'] - database: ['mysql'] - custombase: [ "main", "nmcstable/25.0.6" ] - uses: nextmcloud/.github/.github/workflows/nmc-custom-app-phpunit.yml@master - with: - assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} - appname: 'user_oidc' - server-branch: ${{ matrix.custombase }} - phpversion: ${{ matrix.phpversion }} - database: ${{ matrix.database }} - secrets: inherit \ No newline at end of file diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-versions.yml index 63579131..6b0c3eb6 100644 --- a/.github/workflows/nmc-custom-versions.yml +++ b/.github/workflows/nmc-custom-versions.yml @@ -30,7 +30,8 @@ on: # - stable/** jobs: - build-custom: + + assemble: strategy: fail-fast: false matrix: @@ -41,3 +42,20 @@ jobs: stable: ${{ matrix.custombase }} result: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} secrets: inherit + + phpunit: + strategy: + fail-fast: false + matrix: + phpversion: ['8.0', '8.1'] + database: ['mysql'] + custombase: [ "main", "nmcstable/25.0.6" ] + uses: nextmcloud/.github/.github/workflows/nmc-custom-app-phpunit.yml@master + need: assemble + with: + assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + appname: 'user_oidc' + server-branch: ${{ matrix.custombase }} + phpversion: ${{ matrix.phpversion }} + database: ${{ matrix.database }} + secrets: inherit \ No newline at end of file From e5d81f9fc6e8c77caf6a6479de6fbaab2a1f6450 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Wed, 12 Jul 2023 09:08:29 +0200 Subject: [PATCH 07/14] Fix syntax --- .github/workflows/nmc-custom-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-versions.yml index 6b0c3eb6..ff976790 100644 --- a/.github/workflows/nmc-custom-versions.yml +++ b/.github/workflows/nmc-custom-versions.yml @@ -57,5 +57,5 @@ jobs: appname: 'user_oidc' server-branch: ${{ matrix.custombase }} phpversion: ${{ matrix.phpversion }} - database: ${{ matrix.database }} + database: ${{ matrix.database }} secrets: inherit \ No newline at end of file From 93e7995592302747a87c85cf1eb67ea9bb46d741 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Wed, 12 Jul 2023 09:16:58 +0200 Subject: [PATCH 08/14] Fix needs syntax --- .github/workflows/nmc-custom-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-versions.yml index ff976790..7fa8a832 100644 --- a/.github/workflows/nmc-custom-versions.yml +++ b/.github/workflows/nmc-custom-versions.yml @@ -51,7 +51,7 @@ jobs: database: ['mysql'] custombase: [ "main", "nmcstable/25.0.6" ] uses: nextmcloud/.github/.github/workflows/nmc-custom-app-phpunit.yml@master - need: assemble + needs: assemble with: assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} appname: 'user_oidc' From dc53689e901bb3d1f95c2c22d77e52f851cfb843 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Wed, 12 Jul 2023 12:32:57 +0200 Subject: [PATCH 09/14] Move readme to central setup --- .github/README.md | 58 ----------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .github/README.md diff --git a/.github/README.md b/.github/README.md deleted file mode 100644 index cc522ede..00000000 --- a/.github/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# MagentaCLOUD user_oidc - -Customisation of the Nextcloud delivered OpenID connect app for MagentaCLOUD. - -The app extends the standard `user_oidc` Nextcloud app, -see [upstream configuration hints for basic setup](https://github.com/nextcloud/user_oidc/blob/main/README.md) - -The app is extended by the following features: - -## Event-based provisioning (upstream contribution candidate) -The mechanism allows to implement custom puser provisioning logic in a separate Nextcloud app by -registering and handling a attribute change and provisioning event: - -``` -use OCP\AppFramework\App; -use OCP\AppFramework\Bootstrap\IBootContext; -use OCP\AppFramework\Bootstrap\IBootstrap; -use OCP\AppFramework\Bootstrap\IRegistrationContext; - -class Application extends App implements IBootstrap { -... - public function register(IRegistrationContext $context): void { - $context->registerEventListener(AttributeMappedEvent::class, MyUserAttributeListener::class); - $context->registerEventListener(UserAccountChangeEvent::class, MyUserAccountChangeListener::class); - } -... -} -``` -The provisioning handler should return a `OCA\UserOIDC\Event\UserAccountChangeResult` object - -## Telekom-specific bearer token - -Due to historic reason, Telekom bearer tokens have a close to standard structure, but -require special security implementation in detail. The customisation overrides te standard - - -### Requiring web-token libraries -The central configuration branch `nmc/2372-central-setup` automatic merge will frequently fail if composer -upstream - -The fast and easy way to bring it back to sync with upstream is: -``` -git checkout nmc/2372-central-setup -git rebase --onto main nmc/2372-central-setup -# manually take over everything from upstream for composer.lock (TODO: automate that) - -# update web-token dependencies in composer.lock -composer update web-token -``` -It is recommended to leave the version management for all other libraries to upstream -and only update web-token with the dedicated `composer update web-token`. - - -### Configuring an additional Bearer preshared secret with provider -TODO - -### Testing Bearer secrets -TODO \ No newline at end of file From 3fc8495d557cc18cfd9c37f163cfe62d6e685e7c Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Sat, 19 Aug 2023 08:54:14 +0200 Subject: [PATCH 10/14] Refactor for working fast-fail precheck --- .github/workflows/nmc-custom-release.yml | 58 ++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/nmc-custom-release.yml diff --git a/.github/workflows/nmc-custom-release.yml b/.github/workflows/nmc-custom-release.yml new file mode 100644 index 00000000..5962a538 --- /dev/null +++ b/.github/workflows/nmc-custom-release.yml @@ -0,0 +1,58 @@ +### +# SPDX-License-Identifier: AGPL-3.0 +# +# Author: Bernd rederlechner +# +# Builds a stable release package based on a release assembly +# customisation-- +# +# As soon as a package is deployed to production, the tag and the branch +# MUST STAY FOR 2 years and not deleted. +# +# Release packages, tags and customisation branches not delivered to production should +# be deleted asap a newer release is available. +# + +name: MCLOUD custom app release + +on: + workflow_dispatch: + inputs: + increment: + description: 'Release increment' + required: true + type: number + branch: + type: choice + description: Branch to build a package from + options: + - main + - stable25 + - stable26 + - stable27 + default: main + +jobs: + check-custom: + uses: nextmcloud/.github/.github/workflows/nmc-app-precond.yml@master + with: + versionbranch: ${{ inputs.branch }} + increment: ${{ inputs.increment }} + secrets: inherit + assemble-custom: + uses: nextmcloud/.github/.github/workflows/nmc-custom-assembly.yml@master + needs: check-custom + with: + trunk: 'main' + stable: ${{ inputs.branch }} + result: ${{ format('customisation-{0}-{1}', inputs.branch, inputs.increment ) }} + secrets: inherit + build-custom: + uses: nextmcloud/.github/.github/workflows/nmc-custom-app-build.yml@master + needs: [ check-custom, assemble-custom ] + with: + appname: ${{ needs.check-custom.outputs.appname }} + assembly: ${{ format('customisation-{0}-{1}', inputs.branch , inputs.increment ) }} + tag: ${{ needs.check-custom.outputs.tag }} + prerelease: ${{ inputs.branch == 'main' && true || false }} + secrets: inherit From d41baa1ebeb195c524d818332a4d5f050401a092 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Fri, 1 Sep 2023 12:37:19 +0200 Subject: [PATCH 11/14] Remove obsolete stable versions base in matrix --- .github/workflows/nmc-custom-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-versions.yml index 7fa8a832..6d262e27 100644 --- a/.github/workflows/nmc-custom-versions.yml +++ b/.github/workflows/nmc-custom-versions.yml @@ -35,7 +35,7 @@ jobs: strategy: fail-fast: false matrix: - custombase: [ "main", "nmcstable/25.0.6" ] + custombase: [ "main" ] uses: nextmcloud/.github/.github/workflows/nmc-custom-assembly.yml@master with: trunk: "main" From d525678a033b18c30214c9b963681e604ddf6d93 Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Fri, 1 Sep 2023 19:19:41 +0200 Subject: [PATCH 12/14] Add required composer dependencies programmatically --- ...release.yml => nmc-custom-app-release.yml} | 14 +++- ...rsions.yml => nmc-custom-app-versions.yml} | 15 +++- .../workflows/nmc-custom-oidc-composer.yml | 82 +++++++++++++++++++ 3 files changed, 108 insertions(+), 3 deletions(-) rename .github/workflows/{nmc-custom-release.yml => nmc-custom-app-release.yml} (83%) rename .github/workflows/{nmc-custom-versions.yml => nmc-custom-app-versions.yml} (82%) create mode 100644 .github/workflows/nmc-custom-oidc-composer.yml diff --git a/.github/workflows/nmc-custom-release.yml b/.github/workflows/nmc-custom-app-release.yml similarity index 83% rename from .github/workflows/nmc-custom-release.yml rename to .github/workflows/nmc-custom-app-release.yml index 5962a538..b34abf18 100644 --- a/.github/workflows/nmc-custom-release.yml +++ b/.github/workflows/nmc-custom-app-release.yml @@ -47,9 +47,21 @@ jobs: stable: ${{ inputs.branch }} result: ${{ format('customisation-{0}-{1}', inputs.branch, inputs.increment ) }} secrets: inherit + + composerdep: + strategy: + fail-fast: false + matrix: + custombase: [ "main" ] + uses: ./.github/workflows/nmc-custom-oidc-composer.yml + needs: assemble-custom + with: + assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + secrets: inherit + build-custom: uses: nextmcloud/.github/.github/workflows/nmc-custom-app-build.yml@master - needs: [ check-custom, assemble-custom ] + needs: [ check-custom, composerdep ] with: appname: ${{ needs.check-custom.outputs.appname }} assembly: ${{ format('customisation-{0}-{1}', inputs.branch , inputs.increment ) }} diff --git a/.github/workflows/nmc-custom-versions.yml b/.github/workflows/nmc-custom-app-versions.yml similarity index 82% rename from .github/workflows/nmc-custom-versions.yml rename to .github/workflows/nmc-custom-app-versions.yml index 6d262e27..e18f1941 100644 --- a/.github/workflows/nmc-custom-versions.yml +++ b/.github/workflows/nmc-custom-app-versions.yml @@ -43,15 +43,26 @@ jobs: result: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} secrets: inherit + composerdep: + strategy: + fail-fast: false + matrix: + custombase: [ "main" ] + uses: ./.github/workflows/nmc-custom-oidc-composer.yml + needs: assemble + with: + assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + secrets: inherit + phpunit: strategy: fail-fast: false matrix: phpversion: ['8.0', '8.1'] database: ['mysql'] - custombase: [ "main", "nmcstable/25.0.6" ] + custombase: [ "main" ] uses: nextmcloud/.github/.github/workflows/nmc-custom-app-phpunit.yml@master - needs: assemble + needs: composerdep with: assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} appname: 'user_oidc' diff --git a/.github/workflows/nmc-custom-oidc-composer.yml b/.github/workflows/nmc-custom-oidc-composer.yml new file mode 100644 index 00000000..474b3257 --- /dev/null +++ b/.github/workflows/nmc-custom-oidc-composer.yml @@ -0,0 +1,82 @@ +### +# SPDX-License-Identifier: AGPL-3.0 +# +# Author: Bernd Rederlechner Date: Fri, 1 Sep 2023 19:33:57 +0200 Subject: [PATCH 13/14] Remove commit push blocker --- .github/workflows/nmc-custom-oidc-composer.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/nmc-custom-oidc-composer.yml b/.github/workflows/nmc-custom-oidc-composer.yml index 474b3257..ca247fbd 100644 --- a/.github/workflows/nmc-custom-oidc-composer.yml +++ b/.github/workflows/nmc-custom-oidc-composer.yml @@ -45,7 +45,6 @@ jobs: # set user in case commits are needed git config user.name $BUILD_USER git config user.email $BUILD_EMAIL - git remote set-url origin http://no.such.host # install php dependencies - name: Set up php ${{ env.PHP_VERSION }} From 77aa3687458a34318750c2cf93145f54ef694d4c Mon Sep 17 00:00:00 2001 From: "Bernd.Rederlechner@t-systems.com" Date: Mon, 4 Sep 2023 08:49:39 +0200 Subject: [PATCH 14/14] Fix assembly branch name for dependency check --- .github/workflows/nmc-custom-app-release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/nmc-custom-app-release.yml b/.github/workflows/nmc-custom-app-release.yml index b34abf18..64d287ce 100644 --- a/.github/workflows/nmc-custom-app-release.yml +++ b/.github/workflows/nmc-custom-app-release.yml @@ -51,12 +51,10 @@ jobs: composerdep: strategy: fail-fast: false - matrix: - custombase: [ "main" ] uses: ./.github/workflows/nmc-custom-oidc-composer.yml needs: assemble-custom with: - assembly: ${{ format('customisation-{0}-{1}', github.actor, matrix.custombase) }} + assembly: ${{ format('customisation-{0}-{1}', inputs.branch, inputs.increment) }} secrets: inherit build-custom: