From a6b87067539db3ebe5ac8f4fb8674d1f00efb07b Mon Sep 17 00:00:00 2001 From: William Petit Date: Tue, 20 Sep 2022 16:28:03 +0200 Subject: [PATCH] symfonyAppPipeline: fix hook stages --- vars/hook.groovy | 4 ++-- vars/symfonyAppPipeline.groovy | 12 ++---------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/vars/hook.groovy b/vars/hook.groovy index 1f8cd71..c0efde6 100644 --- a/vars/hook.groovy +++ b/vars/hook.groovy @@ -7,9 +7,9 @@ def call(String name) { return } def hook = load(filepath) - if(hook.metaClass.respondsTo(hook, 'exec')) { + if (hook.metaClass.respondsTo(hook, 'exec')) { hook.exec() } else { error("Hook script '${filepath}' exists but does not expose an exec() function.") } -} \ No newline at end of file +} diff --git a/vars/symfonyAppPipeline.groovy b/vars/symfonyAppPipeline.groovy index 1d90acf..532dd1e 100644 --- a/vars/symfonyAppPipeline.groovy +++ b/vars/symfonyAppPipeline.groovy @@ -6,11 +6,7 @@ def call(String baseImage = 'ubuntu:22.04') { checkout(scm) } stage('Run pre hooks') { - steps { - script { - hook('pre-symfony-app') - } - } + hook('pre-symfony-app') } stage('Run in Symfony image') { def symfonyImage = buildDockerImage(baseImage) @@ -91,11 +87,7 @@ def call(String baseImage = 'ubuntu:22.04') { } } stage('Run post hooks') { - steps { - script { - hook('post-symfony-app') - } - } + hook('post-symfony-app') } } }