From f3f37bdaa90c2afd7369d73de42c59bbe6f8defc Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 9 Jun 2020 19:18:28 -0400 Subject: [PATCH] Deployer: Fix tag toggle logic error; rename to DPL_TAG_ENABLED for back compat --- travis/defaults.sh | 2 +- travis/deployer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/defaults.sh b/travis/defaults.sh index 939af5541..f38a4d496 100755 --- a/travis/defaults.sh +++ b/travis/defaults.sh @@ -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 diff --git a/travis/deployer.sh b/travis/deployer.sh index 5801b7103..a07229b74 100755 --- a/travis/deployer.sh +++ b/travis/deployer.sh @@ -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\].*$ )