From a850aa8f2c48ecc216b835f96fed53833610a020 Mon Sep 17 00:00:00 2001 From: MX <10697207+xMasterX@users.noreply.github.com> Date: Thu, 29 Dec 2022 01:41:23 +0300 Subject: [PATCH] Force no dirty build status for multiple builds kostili and velosipedy --- scripts/version.py | 7 +++++++ site_scons/commandline.scons | 5 +++++ site_scons/environ.scons | 1 + 3 files changed, 13 insertions(+) diff --git a/scripts/version.py b/scripts/version.py index a51909233..53d39af1e 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -42,6 +42,13 @@ class GitVersion: or "" ) + force_no_dirty = ( + os.environ.get("FORCE_NO_DIRTY", None) + or "" + ) + if (force_no_dirty != ""): + dirty = False + if (custom_fz_name != "") and (len(custom_fz_name) <= 8) and (custom_fz_name.isalnum()) and (custom_fz_name.isascii()): return { "GIT_COMMIT": commit, diff --git a/site_scons/commandline.scons b/site_scons/commandline.scons index 3e6859b4e..3419c6934 100644 --- a/site_scons/commandline.scons +++ b/site_scons/commandline.scons @@ -106,6 +106,11 @@ vars.AddVariables( "Replaces OTP flipper name with custom string of 8 chars", "", ), + ( + "FORCE_NO_DIRTY", + "Force disable dirty status of the build", + "", + ), ( "COPRO_CUBE_VERSION", "Cube version", diff --git a/site_scons/environ.scons b/site_scons/environ.scons index 128a667f1..0ffc8a6a2 100644 --- a/site_scons/environ.scons +++ b/site_scons/environ.scons @@ -21,6 +21,7 @@ variables_to_forward = [ "WORKFLOW_BRANCH_OR_TAG", "DIST_SUFFIX", "CUSTOM_FLIPPER_NAME", + "FORCE_NO_DIRTY", # Python & other tools "HOME", "APPDATA",