From 756d2eb004fde3d0eff4669b35e6f1340dcb09af Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 21 Nov 2020 19:29:29 +0100 Subject: [PATCH] mac build: call `git describe` after `git submodule update` otherwise it could be that `git describe` will say "dirty" but the binary will not actually be dirty as it just needed `git submodule update` --- contrib/osx/make_osx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx index a17bbd91f..34364cc16 100755 --- a/contrib/osx/make_osx +++ b/contrib/osx/make_osx @@ -19,7 +19,6 @@ ROOT_FOLDER="$CONTRIB/.." src_dir=$(dirname "$0") cd $src_dir/../.. -VERSION=`git describe --tags --dirty --always` which brew > /dev/null 2>&1 || fail "Please install brew from https://brew.sh/ to continue" which xcodebuild > /dev/null 2>&1 || fail "Please install Xcode and xcode command line tools to continue" @@ -156,6 +155,8 @@ for d in ~/Library/Python/ ~/.pyenv .; do popd done +VERSION=`git describe --tags --dirty --always` + info "Building binary" APP_SIGN="$CODESIGN_CERT" pyinstaller --noconfirm --ascii --clean --name $VERSION contrib/osx/osx.spec || fail "Could not build binary"