include commithash in failures and check if still on failing commit

Author: partouf

bin/lib/fortran_library_builder.py

@@ -491,6 +491,7 @@ def save_build_logging(self, builtok, buildfolder, extralogtext):
 
         buildparameters_copy = self.current_buildparameters_obj.copy()
         buildparameters_copy["logging"] = logging_data + "\n\n" + extralogtext
+        buildparameters_copy["commithash"] = self.get_commit_hash()
 
         headers = {"Content-Type": "application/json", "Authorization": "Bearer " + self.conanserverproxy_token}
 
@@ -528,13 +529,17 @@ def get_commit_hash(self) -> str:
             return self.target_name
 
     def has_failed_before(self):
-        url = f"{conanserver_url}/hasfailedbefore"
+        url = f"{conanserver_url}/whathasfailedbefore"
         request = self.resil_post(url, json_data=json.dumps(self.current_buildparameters_obj))
         if not request.ok:
             raise RuntimeError(f"Post failure for {url}: {request}")
         else:
             response = json.loads(request.content)
-            return response["response"]
+            current_commit = self.get_commit_hash()
+            if response["response"]["commithash"] == current_commit:
+                return response["response"]["failedbefore"]
+            else:
+                return False
 
     def is_already_uploaded(self, buildfolder):
         annotations = self.get_build_annotations(buildfolder)

bin/lib/library_builder.py

@@ -740,6 +740,7 @@ def save_build_logging(self, builtok, buildfolder, extralogtext):
 
         buildparameters_copy = self.current_buildparameters_obj.copy()
         buildparameters_copy["logging"] = logging_data + "\n\n" + extralogtext
+        buildparameters_copy["commithash"] = self.get_commit_hash()
 
         headers = {"Content-Type": "application/json", "Authorization": "Bearer " + self.conanserverproxy_token}
 
@@ -777,13 +778,17 @@ def get_commit_hash(self) -> str:
             return self.target_name
 
     def has_failed_before(self):
-        url = f"{conanserver_url}/hasfailedbefore"
+        url = f"{conanserver_url}/whathasfailedbefore"
         request = self.resil_post(url, json_data=json.dumps(self.current_buildparameters_obj))
         if not request.ok:
             raise RuntimeError(f"Post failure for {url}: {request}")
         else:
             response = json.loads(request.content)
-            return response["response"]
+            current_commit = self.get_commit_hash()
+            if response["response"]["commithash"] == current_commit:
+                return response["response"]["failedbefore"]
+            else:
+                return False
 
     def is_already_uploaded(self, buildfolder):
         annotations = self.get_build_annotations(buildfolder)

bin/lib/rust_library_builder.py

@@ -323,6 +323,7 @@ def save_build_logging(self, builtok, logfolder, source_folder, build_method):
 
         buildparameters_copy = self.current_buildparameters_obj.copy()
         buildparameters_copy["logging"] = logging_data
+        buildparameters_copy["commithash"] = self.get_commit_hash()
 
         if builtok != BuildStatus.Ok:
             buildparameters_copy["flagcollection"] = build_method["build_method"]