spl-core 7.11.2__py3-none-any.whl → 7.12.1__py3-none-any.whl

spl_core/__init__.py

@@ -1 +1 @@
-__version__ = "7.11.2"
+__version__ = "7.12.1"

spl_core/steps/collect_pr_changes.py

@@ -35,28 +35,57 @@ class CollectPRChanges(PipelineStep):
                 changed_files = self._get_changed_files(ci_context.target_branch, ci_context.current_branch)
                 output_file = self.get_outputs()[0]
                 output_file.parent.mkdir(parents=True, exist_ok=True)
-                output_file.write_text(json.dumps(
-                    PR_Changes(
-                        ci_system=ci_context.ci_system.name, target_branch=ci_context.target_branch, current_branch=ci_context.current_branch, commit_id=self._get_commit_id(ci_context), changed_files=changed_files
-                    ).to_dict(),
-                    indent=2
-                ))
+                output_file.write_text(
+                    json.dumps(
+                        PR_Changes(
+                            ci_system=ci_context.ci_system.name, target_branch=ci_context.target_branch, current_branch=ci_context.current_branch, commit_id=self._get_commit_id(ci_context), changed_files=changed_files
+                        ).to_dict(),
+                        indent=2,
+                    )
+                )
                 logger.info(f"PR changes saved to {output_file}")
 
     def _get_changed_files(self, target_branch: str, current_branch: str) -> List[str]:
         """Get list of changed files in the current branch/PR"""
-        try:
-            result = SubprocessExecutor(["git", "fetch", "origin", current_branch]).execute(handle_errors=False)
-            if result and result.returncode == 0:
-                result = SubprocessExecutor(["git", "diff", "--name-only", f"origin/{target_branch}...origin/{current_branch}"]).execute(handle_errors=False)
-
-                if result and result.returncode == 0 and result.stdout.strip():
-                    files = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
-                    return files
+        # Fetch both branches to ensure they exist locally
+        logger.info(f"Fetching branches: {target_branch} and {current_branch}")
+
+        # Fetch the target branch
+        result = SubprocessExecutor(["git", "fetch", "origin", target_branch]).execute(handle_errors=False)
+        if not result or result.returncode != 0:
+            logger.warning(f"Failed to fetch target branch {target_branch}")
+            return []
+
+        # Fetch the current branch
+        result = SubprocessExecutor(["git", "fetch", "origin", current_branch]).execute(handle_errors=False)
+        if not result or result.returncode != 0:
+            logger.warning(f"Failed to fetch current branch {current_branch}")
+            return []
+
+        # Try different git diff approaches in order of preference
+        diff_commands = [
+            ["git", "diff", "--name-only", f"origin/{target_branch}...origin/{current_branch}"],
+            ["git", "diff", "--name-only", f"origin/{target_branch}", f"origin/{current_branch}"],
+            ["git", "diff", "--name-only", f"{target_branch}...{current_branch}"],
+            ["git", "diff", "--name-only", f"{target_branch}", f"{current_branch}"],
+        ]
+
+        for cmd in diff_commands:
+            try:
+                logger.info(f"Trying command: {' '.join(cmd)}")
+                result = SubprocessExecutor(cmd).execute(handle_errors=False)
 
-        except Exception as e:
-            logger.error(f"Git command failed: {e}")
-            return []  # Ensure a list is always returned
+                if result and result.returncode == 0:
+                    if result.stdout.strip():
+                        files = [line.strip() for line in result.stdout.strip().split("\n") if line.strip()]
+                        logger.info(f"Found {len(files)} changed files")
+                        return files
+                    else:
+                        logger.warning("No changed files found")
+                        return []
+            except Exception as e:
+                logger.warning(f"Command failed: {' '.join(cmd)} - {e}")
+                continue
         return []
 
     def get_inputs(self) -> List[Path]:

{spl_core-7.11.2.dist-info → spl_core-7.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: spl-core
-Version: 7.11.2
+Version: 7.12.1
 Summary: Software Product Line Support for CMake
 License: MIT
 License-File: LICENSE

{spl_core-7.11.2.dist-info → spl_core-7.12.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-spl_core/__init__.py,sha256=caodT8M2Hzk-61z4CDgBlU57SGNeKrYbU6LQ4BXlBNk,23
+spl_core/__init__.py,sha256=2szdaPGvYYHEsBMMeewskoN2Yu2URh06p_5-YZo0P9M,23
 spl_core/__run.py,sha256=DphnN7_Bjiw_mOOztsHxTDHS8snz1g2MMWAaJpZxPKM,361
 spl_core/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 spl_core/common/path.py,sha256=sDujd3n4XP1XGjHc7ImXEdjihO6A8BOIDbKCf7HgQ0Y,462
@@ -59,13 +59,13 @@ spl_core/kickstart/templates/project/tools/toolchains/clang/toolchain.cmake,sha2
 spl_core/kickstart/templates/project/tools/toolchains/gcc/toolchain.cmake,sha256=3xKeNw1zjo5dSzu2v9WmFHJajOn64v7UukKNp6U5Dk8,547
 spl_core/main.py,sha256=_hL4j155WZMXog_755bgAH1PeUwvTdJZvVdVw9EWhvo,1225
 spl_core/spl.cmake,sha256=YQMhpSJ9yZaJ34m_W1UqrlTh_r7AKMDuH6-hzK4w98A,4585
-spl_core/steps/collect_pr_changes.py,sha256=0zqjF55K3P8V3ZfCNQc33pYrCxhJJhBmAG4cVxVuy1U,4182
+spl_core/steps/collect_pr_changes.py,sha256=su3yCtSJM9XDlMNOD0L72ooQdKzruc0lUat858Na0Kg,5539
 spl_core/test_utils/archive_artifacts_collection.py,sha256=x7LH5dGIvssyhXsTFzB6rjgb5D2efKvHVpnjId3MNDk,5126
 spl_core/test_utils/artifacts_archiver.py,sha256=OzwFOd7qrU-dJdeebbLMF7dvZZ4QLQhHTVOgbAlEHxg,12121
 spl_core/test_utils/base_variant_test_runner.py,sha256=Oq27lkJlpB_y-p2_8S23F5zjn1438HW148q-hQNz3EY,3795
 spl_core/test_utils/spl_build.py,sha256=bSM6hwhTH9aRryvUvtSPDfk_zoZuKEO5g3QXK4SIrco,8442
-spl_core-7.11.2.dist-info/METADATA,sha256=UJ4McChqwJg7F2rVnzST1cmlGg9POnqqlJXZVNkwq9s,5314
-spl_core-7.11.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-spl_core-7.11.2.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
-spl_core-7.11.2.dist-info/licenses/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
-spl_core-7.11.2.dist-info/RECORD,,
+spl_core-7.12.1.dist-info/METADATA,sha256=Ik-OSx46tVkDaQwcnx16QLHLbAccWH0D0mL5vU18Mmc,5314
+spl_core-7.12.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+spl_core-7.12.1.dist-info/entry_points.txt,sha256=18_sdVY93N1GVBiAHxQ_F9ZM-bBvOmVMOMn7PNe2EqU,45
+spl_core-7.12.1.dist-info/licenses/LICENSE,sha256=UjjA0o8f5tT3wVm7qodTLAhPWLl6kgVyn9FPAd1VeYY,1099
+spl_core-7.12.1.dist-info/RECORD,,