feat: add matrix strategy

[abhijeetSaroha]

Add support of matrix.

Solves #81

[abhijeetSaroha]

While the combination logic successfully creates all 6 combinations, the output seems to be referencing the matrix variables without properly substituting their values. The output looks like this for each combination:

[Setup] Environment: {{ matrix.env }}, Architecture: {{ matrix.arch }}
[Setup] Using base image: {{ vars.base_image }}
[Setup] Installing dependencies for {{ matrix.env }}

Tried using ${{ matrix.env }} or ${{ matrix.arch }} for variable substitution, but this resulted in a "matrix variable not found" error.

Additionally, commands like makim tests.smoke that were previously functional are no longer running after this change.

[xmnlab]

hi @abhijeetSaroha, thanks for working on that! it seems it is almost ready to go :)

the jinja template is defined as ${{ ... }} as defined here: https://github.com/osl-incubator/makim/blob/main/src/makim/core.py#L51

it fails because it is trying to process, but there are some errors inside the code.

check all the usage of TEMPLATE in the core.py, for example here: https://github.com/osl-incubator/makim/blob/main/src/makim/core.py#L379

as you can see there, it sets the variables for env and for vars, you need to add it for matrix as well.

let me know if you need any more details please

[abhijeetSaroha]

It works fine now as it should be.

I also break the function _run_command in two functions as you said. I have create another function for MakimLogs execution.

https://github.com/abhijeetSaroha/makim/blob/matrix-strategy/src/makim/core.py#L455C2-L480C42

[xmnlab]

@abhijeetSaroha , thanks for working on that.

in general it looks good to me .. just a few changes, I will also paste here the complete diff:

diff --git a/src/makim/core.py b/src/makim/core.py
index 06e1f7a..cd6fb11 100644
--- a/src/makim/core.py
+++ b/src/makim/core.py
@@ -33,6 +33,7 @@ from makim.logs import MakimError, MakimLogs
 
 AppConfigType: TypeAlias = Dict[str, Union[str, List[str]]]
 
+
 SCOPE_GLOBAL = 0
 SCOPE_GROUP = 1
 SCOPE_TARGET = 2
@@ -495,7 +496,7 @@ class Makim:
             List of dictionaries, each containing one possible combination
         """
         if not matrix_config:
-            return [{}]
+            return []
 
         # Convert matrix config into format suitable for product
         keys = list(matrix_config.keys())
@@ -588,7 +589,7 @@ class Makim:
             )
 
         # Get matrix configuration if it exists
-        matrix_combinations: list[dict[str, Any]] = [{}]
+        matrix_combinations: list[dict[str, Any]] = []
         if matrix_config := self.task_data.get('matrix', {}):
             matrix_combinations = self._generate_matrix_combinations(
                 matrix_config
@@ -631,7 +632,7 @@ class Makim:
         width, _ = get_terminal_size()
 
         # Run command for each matrix combination
-        for matrix_vars in matrix_combinations:
+        for matrix_vars in matrix_combinations or [{}]:
             # Update environment variables
             for k, v in env.items():
                 os.environ[k] = v

also please rebase your branch so you can get the changes that fixes the linter on ci.

[xmnlab]

Suggested change

	matrix_combinations: list[dict[str, Any]] = [{}]
	matrix_combinations: list[dict[str, Any]] = []

[xmnlab]

Suggested change

	return [{}]
	return []

[xmnlab]

Suggested change

	for matrix_vars in matrix_combinations:
	for matrix_vars in matrix_combinations or [{}]:

[abhijeetSaroha]

@xmnlab, I have made the changes and rebase the branch too.

[xmnlab]

thank you @abhijeetSaroha ! great job!

[github-actions]

🎉 This PR is included in version 1.18.0 🎉

The release is available on:

• 1.18.0
• GitHub release

Your semantic-release bot 📦🚀