From 376d5eb6e0b1d388aab9e6e3840bdbc7d4d85362 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Wed, 11 Jun 2025 16:37:08 +0000 Subject: [PATCH] mac build: call "git describe" without "--dirty" as we dirty the git clone ourselves, well the locale submodule, when we rm the .po files --- contrib/osx/make_osx.sh | 3 ++- contrib/osx/sign_osx.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/osx/make_osx.sh b/contrib/osx/make_osx.sh index b6cf47625..2797de5f4 100755 --- a/contrib/osx/make_osx.sh +++ b/contrib/osx/make_osx.sh @@ -208,7 +208,8 @@ find "$VENV_DIR/lib/python$PY_VER_MAJOR/site-packages/" -type f -name '*.so' -pr info "Faking timestamps..." find . -exec touch -t '200101220000' {} + || true -VERSION=$(git describe --tags --dirty --always) +# note: no --dirty, as we have dirtied electrum/locale/ ourselves. +VERSION=$(git describe --tags --always) info "Building binary" ELECTRUM_VERSION=$VERSION pyinstaller --noconfirm --clean contrib/osx/pyinstaller.spec || fail "Could not build binary" diff --git a/contrib/osx/sign_osx.sh b/contrib/osx/sign_osx.sh index 785f3b8e9..62730f932 100755 --- a/contrib/osx/sign_osx.sh +++ b/contrib/osx/sign_osx.sh @@ -59,7 +59,8 @@ function DoCodeSignMaybe { # ARGS: infoName fileOrDirName codesign -f -v $deep -s "$CODESIGN_CERT" $hardened_arg "$file" || fail "Could not code sign ${infoName}" } -VERSION=$(git describe --tags --dirty --always) +# note: no --dirty, as we have dirtied electrum/locale/ ourselves. +VERSION=$(git describe --tags --always) DoCodeSignMaybe "app bundle" "dist/${PACKAGE}.app"