ci: re-add stale cache and force-test shared build workspace

Signed-off-by: Iuliu Antoniu-Popovici <iuliu-antoniu.popovici@analog.com>

Author: cseci

.github/workflows/build-xilinx-platform.yaml

@@ -56,6 +56,11 @@ concurrency:
 
 jobs:
   build-xilinx-projects:
+    # TEST
+    if: always()
+    strategy:
+      matrix:
+        runs-on: [noos-runner-xilinx-test, noos-runner-xilinx-test, noos-runner-xilinx-test, noos-runner-xilinx-test]
     env:
       CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
       TOOLS_REPO: ${{ secrets.TOOLS_REPO }}
@@ -66,7 +71,8 @@ jobs:
       RELEASES_DIR: ${{ github.workspace }}/latest_build
       LOGS_DIR: ${{ github.workspace }}/logs
       NO_OS_CACHE_DIR: ${{ github.workspace }}/deps_cache
-    runs-on: noos-runner-xilinx
+    # TEST
+    runs-on: ${{ matrix.runs-on }}
     timeout-minutes: 600
     steps:
       - name: Checkout code

tools/scripts/build_projects.py

@@ -134,6 +134,27 @@ def run_cmd(cmd):
 def to_blue(str):
 	return TBLUE + str + TWHITE
 
+def cmake_cache_source_mismatch(build_dir, noos):
+	"""True if build_dir's CMakeCache.txt was generated from a different source path.
+
+	CMake refuses to reuse a cache whose CMAKE_HOME_DIRECTORY differs, which
+	happens when CI agents check the repo out under different absolute paths.
+	"""
+	cache = os.path.join(build_dir, 'CMakeCache.txt')
+	if not os.path.isfile(cache):
+		return False
+	want = os.path.realpath(noos)
+	try:
+		with open(cache) as f:
+			for line in f:
+				if line.startswith('CMAKE_HOME_DIRECTORY:'):
+					have = line.split('=', 1)[1].strip()
+					return os.path.realpath(have) != want
+	except OSError:
+		# Unreadable cache: treat as mismatch so --fresh regenerates it cleanly.
+		return True
+	return False
+
 SKIP_DOWNLOAD = None
 key = 'SKIP_DOWNLOAD'
 if key in os.environ:
@@ -362,30 +383,16 @@ def build_cmake_project(noos, project, _platform, export_dir, log_dir, cmake_bui
 		jobs = int(multiprocessing.cpu_count() / 2) or 1
 		# Pass an absolute --build-dir: no_os_build anchors a relative one to the
 		# repo root, which would not match the build_dir we clean/probe here.
-		# Xilinx: reuse cached BSP unless the .xsa changed (new_hdf). Shared build
-		# dirs mean CMakeCache paths won't match the current checkout, but the BSP
-		# artifacts don't depend on source paths - only the .xsa matters.
-		fresh_flag = " --fresh" if (platform == 'xilinx' and new_hdf) else ""
-
-		# Update cmake cache with current working directory
-		if _platform == 'xilinx':
-			cmake_cache_file = build_dir / 'CMakeCache.txt'
-			cmake_cache_file_new = build_dir / 'CMakeCache_new.txt'
-			cmake_toolchain_new = f"CMAKE_TOOLCHAIN_FILE:FILEPATH={noos}/drivers/platform/xilinx/toolchain.cmake"
-			if os.path.exists(cmake_cache_file):
-				with open(cmake_cache_file, "r") as old:
-					lines = old.readlines()
-					with open(cmake_cache_file_new, "w") as new:
-						for line in lines:
-							if "CMAKE_TOOLCHAIN_FILE:FILEPATH=" in line:
-								line = cmake_toolchain_new
-							elif "no-os_SOURCE_DIR:STATIC" in line:
-								line = f"no-os_SOURCE_DIR:STATIC={noos}"
-							elif "CMAKE_HOME_DIRECTORY:INTERNAL" in line:
-								line = f"CMAKE_HOME_DIRECTORY:INTERNAL={noos}"
-							new.write(line)
-				os.remove(cmake_cache_file)
-				os.rename(cmake_cache_file_new, cmake_cache_file)
+		# Xilinx: keep the cached BSP, clean only objects unless the .xsa changed
+		# or the cache came from a different source path (another CI agent).
+		stale_cache = platform == 'xilinx' and cmake_cache_source_mismatch(str(build_dir), noos)
+		if platform == 'xilinx' and build_dir.exists() and not new_hdf and not stale_cache:
+			# CMAKE, not bare 'cmake': the sourced xilinx env leads PATH with Vitis's broken one.
+			clean_cmd = "%s --build %s --target clean > /dev/null 2>&1" % (CMAKE, build_dir)
+			os.system(clean_cmd)
+			fresh_flag = ""
+		else:
+			fresh_flag = " --fresh"
 
 		build_cmd = ("python3 %s/tools/scripts/no_os_build.py build"
 			     " --project %s --variant %s --board %s"
@@ -436,8 +443,6 @@ def build_cmake_project(noos, project, _platform, export_dir, log_dir, cmake_bui
 
 	return ok
 
-<<<<<<< HEAD
-=======
 def check_built_projects(projects = dict):
 	new_projects = {}
 	for project, status in projects.items():
@@ -506,7 +511,6 @@ def _finalize_bsp_hash(builds_dir, noos_dir):
 	if os.path.isfile(regen_marker):
 		os.remove(regen_marker)
 
->>>>>>> 4afb59e42 (ci: create shared build workspace and filters)
 def main():
 	(noos, export_dir, log_dir, _builds_dir, _platform, hdl_branch, _projects) = parse_input()
 	projects_dir = os.path.join(noos,'projects')