Deployer: Fix tag toggle logic error; rename to DPL_TAG_ENABLED for back compat

This commit is contained in:
mazmazz 2020-06-09 19:18:28 -04:00
parent 72c10010ba
commit f3f37bdaa9
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@
: ${DPL_FORCE_OFF} # Force-disable Deployer for tags
: ${DPL_FORCE_OFF_GITHUB} # Force-disable Deployer for GitHub Releases
: ${DPL_FORCE_OFF_FTP} # Force-disable Deployer for FTP
: ${DPL_DEPLOY_TAG:=1} # Trigger Deployer on a release tag
: ${DPL_TAG_ENABLED:=1} # Trigger Deployer on a release tag
: ${DPL_BRANCH_TRIGGER:=deployer} # Use a word in the branch name to trigger Deployer
: ${DPL_COMMIT_TRIGGER:=deployer} # Use a [word] in the commit message to trigger Deployer
: ${DPL_UPLOAD_BINARY:=1} # Upload an archive containing the binary file plus $ASSET_FILES_DOCS

View file

@ -45,7 +45,7 @@ fi;
########################################
if [[ ("$DPL_DISABLED" != "1" &&
("$DPL_FORCE_ON" == "1" ||
("$TRAVIS_TAG" != "" && "$DPL_DEPLOY_TAG" != "1") ||
("$TRAVIS_TAG" != "" && "$DPL_TAG_ENABLED" == "1") ||
"$TRAVIS_BRANCH" =~ ^.*$DPL_BRANCH_TRIGGER.*$ ||
"$TRAVIS_COMMIT_MESSAGE" =~ ^.*\[$DPL_COMMIT_TRIGGER\].*$
)