Merge branch 'master' into feature/packages-api-integration
Continuous Integration / config (pull_request) Successful in 9s
Continuous Integration / prepare (pull_request) Successful in 1m20s
Continuous Integration / build-production (pull_request) Skipped
Continuous Integration / build (pull_request) Successful in 2m1s
Continuous Integration / test (pull_request) Successful in 1m55s
Continuous Integration / deploy-production (pull_request) Skipped
Deploy / deploy (pull_request) Successful in 34s
Continuous Integration / deploy-test (pull_request) Successful in 35s
Continuous Integration / config (pull_request) Successful in 9s
Continuous Integration / prepare (pull_request) Successful in 1m20s
Continuous Integration / build-production (pull_request) Skipped
Continuous Integration / build (pull_request) Successful in 2m1s
Continuous Integration / test (pull_request) Successful in 1m55s
Continuous Integration / deploy-production (pull_request) Skipped
Deploy / deploy (pull_request) Successful in 34s
Continuous Integration / deploy-test (pull_request) Successful in 35s
This commit is contained in:
@@ -3,7 +3,16 @@ on:
|
|||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
inputs:
|
inputs:
|
||||||
deploy_production:
|
deploy_production:
|
||||||
description: 'Na een succesvolle build/test ook naar productie deployen (naast de automatische testdeploy)?'
|
description: 'Deploy to Production'
|
||||||
|
type: boolean
|
||||||
|
default: false
|
||||||
|
# Bij een handmatige run wordt standaard NIET naar test gedeployed
|
||||||
|
# (default false), analoog aan deploy_production hierboven - je vinkt
|
||||||
|
# dit bewust aan. Dit is los van de automatische testdeploy bij een
|
||||||
|
# push naar master (zie de 'if' van de deploy-test-job hieronder), die
|
||||||
|
# altijd blijft gebeuren ongeacht dit vinkje.
|
||||||
|
deploy_test:
|
||||||
|
description: 'Deploy to Test'
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
pull_request:
|
pull_request:
|
||||||
@@ -236,7 +245,12 @@ jobs:
|
|||||||
# naar de testomgeving deployed, om testen tijdens deze werkbranch te
|
# naar de testomgeving deployed, om testen tijdens deze werkbranch te
|
||||||
# vereenvoudigen. Verwijder de 'pull_request'-conditie hieronder weer
|
# vereenvoudigen. Verwijder de 'pull_request'-conditie hieronder weer
|
||||||
# zodra dat niet meer nodig is.
|
# zodra dat niet meer nodig is.
|
||||||
if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
|
#
|
||||||
|
# De push-naar-master- en pull_request-condities hieronder zijn bewust
|
||||||
|
# ONAFHANKELIJK van het 'deploy_test'-vinkje: de automatische testdeploy
|
||||||
|
# bij een merge naar master moet altijd blijven gebeuren. Het vinkje
|
||||||
|
# geldt alleen voor handmatige workflow_dispatch-runs.
|
||||||
|
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.deploy_test == 'true') || github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
|
||||||
uses: ./.gitea/workflows/deploy.yaml
|
uses: ./.gitea/workflows/deploy.yaml
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
# Deze waarden komen uit het `env:`-blok bovenaan dit bestand, via de
|
# Deze waarden komen uit het `env:`-blok bovenaan dit bestand, via de
|
||||||
|
|||||||
Reference in New Issue
Block a user