From caed499d09dee5f5d6bd67668eaadaa9ebb5cee1 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Sat, 22 Feb 2020 20:54:54 +0100 Subject: [PATCH] fix(ci): Fix increment-version.sh script trigger-builds.sh now makes use of the definitions in trigger-definitions.config. Therefore we need to make those definitions available. --- resources/build/increment-version.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/build/increment-version.sh b/resources/build/increment-version.sh index 29d52829cf..a6cc75e849 100755 --- a/resources/build/increment-version.sh +++ b/resources/build/increment-version.sh @@ -19,6 +19,7 @@ THIS_SCRIPT="$(greadlink -f "${BASH_SOURCE[0]}" 2>/dev/null || readlink -f "${BA . "$(dirname "$THIS_SCRIPT")/build-utils.sh" ## END STANDARD BUILD SCRIPT INCLUDE +. "$(dirname "$THIS_SCRIPT")/trigger-definitions.config" . "$(dirname "$THIS_SCRIPT")/trigger-builds.sh" gitbranch=`git branch --show-current` @@ -121,9 +122,9 @@ if [ "$action" == "commit" ]; then fi # - # After this script finishes in CI, we will be pushing the new history to + # After this script finishes in CI, we will be pushing the new history to # downloads.keyman.com, so we need to finish with the branch here that has the - # latest history in it. We don't need to cleanup the branch because the CI will + # latest history in it. We don't need to cleanup the branch because the CI will # do that for us. # @@ -131,4 +132,4 @@ if [ "$action" == "commit" ]; then git checkout "$branch" fi -exit 0 \ No newline at end of file +exit 0