File tree Expand file tree Collapse file tree 2 files changed +2
-2
lines changed
Expand file tree Collapse file tree 2 files changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,7 @@ case $TRAVIS_OS_NAME in
1212 ;;
1313 * ) exit 1 ;;
1414esac
15- QTBIN=${QTBIN:- $(qmake -query QT_HOST_BINS)}
15+ QTBIN=${QTBIN:- $($EXECUTOR qmake -query QT_HOST_BINS)}
1616df -h .
1717
1818if $INSTALLER && ! $TIMEOUT && [ " $TRAVIS_REPO_SLUG " == " trikset/trik-studio" ] && [ " $TRAVIS_PULL_REQUEST " == " false" ]
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ PATH=$QT_DIR/bin:$PATH
3636# FULL_VERSION is like v3.3.0[-rc9][-20-abc123][-dirty]
3737FULL_VERSION=$( $binary_path -platform minimal --version | grep -Eo ' [^ ]+$' )
3838# QT IFW want version like [0-9]+((.|-)[0-9]+)*
39- VERSION=$( echo $FULL_VERSION | sed -e ' s/[^0-9.-]//g' -e ' s/[^0-9] $//g' )
39+ VERSION=$( echo $FULL_VERSION | sed -e ' s/[^0-9.-]//g' -e ' s/[.-]* $//g' -e ' s/^[.-]*//g ' )
4040grep -r -l --include=* .xml ' <Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i -e " s/<Version>.*<\/Version>/<Version>$VERSION <\/Version>/"
4141cd config
4242grep -r -l --include=* .xml ' <Version>.*</Version>' . | xargs $GNU_SED_COMMAND -i -e " s/<Version>.*<\/Version>/<Version>$FULL_VERSION <\/Version>/"
You can’t perform that action at this time.
0 commit comments