Merge branch 'develop' into feature_cicd_fix

2021-11-23 22:32:05 +01:00 · 2021-11-23 22:32:05 +01:00 · ec29e7f7fe
commit ec29e7f7fe
parent bb03f89057 b90b14e271
2 changed files with 1 additions and 1 deletions
--- a/scripts/.drone-build.sh.swp
+++ b/scripts/.drone-build.sh.swp
--- a/scripts/drone-build.sh
+++ b/scripts/drone-build.sh
@ -31,7 +31,7 @@ if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
    return 0
 fi

-if { [ "$branch" = develop ] && [ "$event" = push ]; } ; then
+if { [ "$branch" = develop ] && [ "$event" = push ] && [ "$step_name" != build_feature ]; } ; then
    echo "BUILD DEV"
    docker build -t docker.pbiernat.dev/nginx-php:dev .
    return 0