openubmc-bingo 0.6.11__py3-none-any.whl → 0.6.13__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.11'
+__version__ = '0.6.13'

bmcgo/utils/build_conans.py

@@ -90,30 +90,37 @@ class BuildConans(object):
             options += f" -s {name}={value}"
 
         cmd = f"conan install --requires={node.ref} {self.cmd} {options}"
-        cmd += f" --build=\"{node.name}/*\" --build=missing -f json --lockfile={self.lockfile}"
+        cmd += f" --build=missing -f json --lockfile={self.lockfile}"
+        if self.force_build:
+            cmd += f" --build=\"{node.name}/*\""
         try:
-            logfile = f"{self.log_dir}/conan_build_{node.name}.log"
-            log.debug(f">>>> {cmd}")
-            log.info(f">>>> build {node.ref} start, logfile: {logfile}")
-            with os.fdopen(os.open(logfile, os.O_RDWR | os.O_CREAT, stat.S_IWUSR | stat.S_IRUSR), "a+") as f:
-                real_cmd = shlex.split(cmd)
-                pipe = subprocess.Popen(real_cmd, stdout=f, stderr=f)
-                start_time = time.time()
-                while True:
-                    if pipe.poll() is not None:
-                        break
-                    # 1800秒超时
-                    if time.time() - start_time > 1800:
-                        pipe.kill()
-                        raise errors.BmcGoException(f"================== {node.name} 构建超时 ==================")
-                    time.sleep(1)
-                if pipe.returncode != 0:
-                    log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
-                    f.seek(0)
-                    conan_log = f.read()
-                    log.error(conan_log)
-                    log.error(f"================== {node.name} 构建失败日志结束位置 ==================")
-                    raise errors.BmcGoException(f"================== {node.name} 构建失败 ==================")
+            for i in range(1, 2):
+                logfile = f"{self.log_dir}/conan_build_{node.name}.log"
+                log.debug(f">>>> {cmd}")
+                log.info(f">>>> build {node.ref} start, logfile: {logfile}")
+                with os.fdopen(os.open(logfile, os.O_RDWR | os.O_CREAT, stat.S_IWUSR | stat.S_IRUSR), "a+") as f:
+                    real_cmd = shlex.split(cmd)
+                    pipe = subprocess.Popen(real_cmd, stdout=f, stderr=f)
+                    start_time = time.time()
+                    while True:
+                        if pipe.poll() is not None:
+                            break
+                        # 1800秒超时
+                        if time.time() - start_time > 1800:
+                            pipe.kill()
+                            raise errors.BmcGoException(f"================== {node.name} 构建超时 ==================")
+                        time.sleep(1)
+                    if pipe.returncode != 0:
+                        # 首次增量构建失败时切换到源码构建模式
+                        if i == 1 and not self.force_build:
+                            cmd += f" --build=\"{node.name}/*\""
+
+                        log.error(f"================== {node.name} 构建失败日志起始位置 ==================")
+                        f.seek(0)
+                        conan_log = f.read()
+                        log.error(conan_log)
+                        log.error(f"================== {node.name} 构建失败日志结束位置 ==================")
+                        raise errors.BmcGoException(f"================== {node.name} 构建失败 ==================")
             log.success(f"<<<< build {node.ref} finished")
         except Exception as e:
             self.exception = e

{openubmc_bingo-0.6.11.dist-info → openubmc_bingo-0.6.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.11
+Version: 0.6.13
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.11.dist-info → openubmc_bingo-0.6.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=f9jG-AQzuUOV5FcUHlWTuKHojRVWOYy0WRWLjzY7f68,562
+bmcgo/__init__.py,sha256=Uh6sIl54OeKW_-VdwePJtnT2PnzcqBgPSynw8oQA4HQ,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -241,7 +241,7 @@ bmcgo/tasks/conan/conanfile.py,sha256=MI6c2QNKixrkA5Tx4i9EKw7bZ20GVDIKgkaMwNHQKc
 bmcgo/utils/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/basic_enums.py,sha256=L5VtHtzSvs6duAnphgqDGXX80Wit3Y7DjMlpi9MCxyI,1348
 bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
-bmcgo/utils/build_conans.py,sha256=1kugt48GRf2P-IilkxFSBTl3i8_Xk5EB4cN2LeuZZJY,9330
+bmcgo/utils/build_conans.py,sha256=-60beCS_TqAdlFvmL5aAEm8MtNX6hcGa-PIdtB3RCj4,9711
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.11.dist-info/METADATA,sha256=GwLK6z6A84kM7Yl82K0fVA31QClRhg6EIKLJGuYubhI,1010
-openubmc_bingo-0.6.11.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.11.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.11.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.11.dist-info/RECORD,,
+openubmc_bingo-0.6.13.dist-info/METADATA,sha256=5np_r3mkW_I_pGTIl4TJWGclGljGW10m7yqFh-kyu9g,1010
+openubmc_bingo-0.6.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.13.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.13.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.13.dist-info/RECORD,,