Skip to content

Commit eb87e4b

Browse files
committed
Fail if no installer found for test
1 parent 38df242 commit eb87e4b

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

buildScripts/github/build_installer.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ set -euxo pipefail
33
BRANCH_NAME="${BRANCH_NAME:-${GITHUB_REF#refs/*/}}"
44
BRANCH_NAME=${BRANCH_NAME//\//-}
55

6-
QTBIN=${QTBIN:-$($EXECUTOR bash -c 'eval $(make qmake -n | cut -f 1 -d " ") -query QT_INSTALL_BINS')}
7-
case $RUNNER_OS in
6+
QTBIN="${QTBIN:-$($EXECUTOR bash -c 'eval $(make qmake -n | cut -f 1 -d " ") -query QT_INSTALL_BINS')}"
7+
case "$RUNNER_OS" in
88
macOS)
9-
QTIFWBIN=$HOME/qtifw/bin
9+
QTIFWBIN="$HOME"/qtifw/bin
1010
TSNAME="trik-studio-installer-mac-$BRANCH_NAME.dmg"
1111
;;
1212
Linux)
@@ -19,23 +19,23 @@ df -h .
1919

2020
NEED_DEPLOY=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false )
2121

22-
if $NEED_DEPLOY ; then
22+
if "$NEED_DEPLOY" ; then
2323
$EXECUTOR bash -c "mkdir -p $HOME/.ssh && install -m 600 /dev/null $HOME/.ssh/id_rsa && echo \"$ssh_key\" > $HOME/.ssh/id_rsa"
2424
fi
2525

26-
if [[ $RUNNER_OS == Linux ]] ; then
26+
if [[ "$RUNNER_OS" == Linux ]] ; then
2727
echo Start build checker archive
2828
$EXECUTOR bash -c "bin/build-checker-installer.sh"
29-
if $NEED_DEPLOY ; then
29+
if "$NEED_DEPLOY" ; then
3030
$EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no -vvv -i $HOME/.ssh/id_rsa' bin/trik_checker.tar.xz $username@$host:~/dl/ts/fresh/checker/checker-linux-$CONFIG-$BRANCH_NAME.tar.xz"
3131
fi
3232
fi
3333

3434
echo Start build installer
3535
$EXECUTOR bash -c "installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
3636

37-
INSTALLER_NAME=$(find installer -name "trik-studio*installer*" -print -quit)
37+
INSTALLER_NAME=$(find installer -name "trik-studio*installer*" -print -quit | grep . )
3838

39-
if $NEED_DEPLOY ; then
39+
if "$NEED_DEPLOY" ; then
4040
$EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no -vvv -i $HOME/.ssh/id_rsa' $INSTALLER_NAME $username@$host:~/dl/ts/fresh/installer/$TSNAME"
4141
fi

0 commit comments

Comments
 (0)