From de40def6b102b8c2dd4b6df450e32754d20e6044 Mon Sep 17 00:00:00 2001
From: Artur Stolear <artur.stolear@gmail.com>
Date: Thu, 31 Oct 2024 06:10:24 +0100
Subject: [PATCH] set matrix

---
 .github/workflows/_artifacts_linux.yml        |  4 +-
 .github/workflows/_jobs_matrix.yml            |  2 +-
 .github/workflows/ci.yml                      | 58 ++++++++++---------
 build/.run/DockerMatrix.run.xml               | 20 -------
 .../{TestMatrix.run.xml => SetMatrix.run.xml} |  4 +-
 build/config/Tasks/BaseMatrix.cs              | 25 --------
 build/config/Tasks/DockerMatrix.cs            | 12 ----
 build/config/Tasks/SetMatrix.cs               | 20 +++++++
 build/config/Tasks/TestMatrix.cs              | 11 ----
 9 files changed, 57 insertions(+), 99 deletions(-)
 delete mode 100644 build/.run/DockerMatrix.run.xml
 rename build/.run/{TestMatrix.run.xml => SetMatrix.run.xml} (81%)
 delete mode 100644 build/config/Tasks/BaseMatrix.cs
 delete mode 100644 build/config/Tasks/DockerMatrix.cs
 create mode 100644 build/config/Tasks/SetMatrix.cs
 delete mode 100644 build/config/Tasks/TestMatrix.cs

diff --git a/.github/workflows/_artifacts_linux.yml b/.github/workflows/_artifacts_linux.yml
index 1bf74f6f91..3138a0ccf9 100644
--- a/.github/workflows/_artifacts_linux.yml
+++ b/.github/workflows/_artifacts_linux.yml
@@ -21,7 +21,9 @@ jobs:
     runs-on: ${{ inputs.runner }}
     strategy:
       fail-fast: false
-      matrix: ${{fromJson(needs.matrix.outputs.matrix)}}
+      matrix: 
+        dockerDistro: ${{fromJson(needs.matrix.outputs.dockerDistros)}}
+        dotnetVersion: ${{fromJson(needs.matrix.outputs.dotnetVersions)}}
     steps:
     -
       name: Checkout
diff --git a/.github/workflows/_jobs_matrix.yml b/.github/workflows/_jobs_matrix.yml
index 087c0d91f3..11501893a6 100644
--- a/.github/workflows/_jobs_matrix.yml
+++ b/.github/workflows/_jobs_matrix.yml
@@ -25,4 +25,4 @@ jobs:
         name: '[Matrix]'
         id: matrix
         shell: pwsh
-        run: dotnet run/config.dll --target=DockerMatrix
\ No newline at end of file
+        run: dotnet run/config.dll --target=SetMatrix
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e63121db80..20f01f5d4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -49,11 +49,11 @@ jobs:
     needs: [ prepare ]
     uses: ./.github/workflows/_build.yml
 
-  unit_test:
-    name: Test
-    needs: [ prepare ]
-    uses: ./.github/workflows/_unit_tests.yml
-    secrets: inherit
+#  unit_test:
+#    name: Test
+#    needs: [ prepare ]
+#    uses: ./.github/workflows/_unit_tests.yml
+#    secrets: inherit
 #
 #  artifacts_windows_test:
 #    name: Artifacts Windows
@@ -76,29 +76,33 @@ jobs:
       runner: ${{ matrix.runner }}
       arch: ${{ matrix.arch }}
 
-  docker_linux_images:
-    needs: [ build ]
-    name: Docker Images (${{ matrix.arch }})
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - arch: amd64
-            runner: ubuntu-latest
-          - arch: arm64
-            runner: ubuntu-latest
-
-    uses: ./.github/workflows/_docker.yml
-    with:
-      runner: ${{ matrix.runner }}
-      arch: ${{ matrix.arch }}
-    secrets: inherit
+#  docker_linux_images:
+#    needs: [ build ]
+#    name: Docker Images (${{ matrix.arch }})
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        include:
+#          - arch: amd64
+#            runner: ubuntu-latest
+#          - arch: arm64
+#            runner: ubuntu-latest
+#
+#    uses: ./.github/workflows/_docker.yml
+#    with:
+#      runner: ${{ matrix.runner }}
+#      arch: ${{ matrix.arch }}
+#    secrets: inherit
 
-  docker_linux_manifests:
-    needs: [ docker_linux_images ]
-    name: Docker Manifests
-    uses: ./.github/workflows/_docker_manifests.yml
-    secrets: inherit
+#  docker_linux_manifests:
+#    needs: [ docker_linux_images ]
+#    name: Docker Manifests
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        runner: ubuntu-latest
+#    uses: ./.github/workflows/_docker_manifests.yml
+#    secrets: inherit
 
 #  publish:
 #    name: Publish
diff --git a/build/.run/DockerMatrix.run.xml b/build/.run/DockerMatrix.run.xml
deleted file mode 100644
index c2e3f49a3a..0000000000
--- a/build/.run/DockerMatrix.run.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="DockerMatrix" type="DotNetProject" factoryName=".NET Project" folderName="Config">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/config" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerMatrix" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
-    <option name="PASS_PARENT_ENVS" value="1" />
-    <option name="USE_EXTERNAL_CONSOLE" value="0" />
-    <option name="USE_MONO" value="0" />
-    <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/config/config.csproj" />
-    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
-    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
-    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net8.0" />
-    <method v="2">
-      <option name="Build" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/build/.run/TestMatrix.run.xml b/build/.run/SetMatrix.run.xml
similarity index 81%
rename from build/.run/TestMatrix.run.xml
rename to build/.run/SetMatrix.run.xml
index 55e3b28fc8..3e042eaffc 100644
--- a/build/.run/TestMatrix.run.xml
+++ b/build/.run/SetMatrix.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="TestMatrix" type="DotNetProject" factoryName=".NET Project" folderName="Config">
+  <configuration default="false" name="SetMatrix" type="DotNetProject" factoryName=".NET Project" folderName="Config">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/config" />
-    <option name="PROGRAM_PARAMETERS" value="--target=TestMatrix" />
+    <option name="PROGRAM_PARAMETERS" value="--target=SetMatrix" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/build/config/Tasks/BaseMatrix.cs b/build/config/Tasks/BaseMatrix.cs
deleted file mode 100644
index abe1cf69ca..0000000000
--- a/build/config/Tasks/BaseMatrix.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using Cake.Json;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
-
-namespace Config.Tasks;
-
-public class BaseMatrix : FrostingTask<BuildContext>
-{
-    protected static void OutputMatrix(BuildContext context, object matrix)
-    {
-        JsonConvert.DefaultSettings = () => new JsonSerializerSettings
-        {
-            ContractResolver = new CamelCasePropertyNamesContractResolver()
-        };
-
-        if (context.BuildSystem().IsRunningOnGitHubActions)
-        {
-            context.GitHubActions().Commands.SetOutputParameter("matrix", context.SerializeJson(matrix));
-        }
-        else
-        {
-            context.Information(context.SerializeJson(matrix));
-        }
-    }
-}
diff --git a/build/config/Tasks/DockerMatrix.cs b/build/config/Tasks/DockerMatrix.cs
deleted file mode 100644
index 9e1bc13e12..0000000000
--- a/build/config/Tasks/DockerMatrix.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace Config.Tasks;
-
-[TaskName(nameof(DockerMatrix))]
-[TaskDescription("Creates a docker build matrix")]
-public class DockerMatrix : BaseMatrix
-{
-    public override void Run(BuildContext context) => OutputMatrix(context, new
-    {
-        DockerDistro = Constants.DockerDistros,
-        DotnetVersion = Constants.DotnetVersions
-    });
-}
diff --git a/build/config/Tasks/SetMatrix.cs b/build/config/Tasks/SetMatrix.cs
new file mode 100644
index 0000000000..44bd8a6c3d
--- /dev/null
+++ b/build/config/Tasks/SetMatrix.cs
@@ -0,0 +1,20 @@
+using Cake.Json;
+
+namespace Config.Tasks;
+
+public class SetMatrix : FrostingTask<BuildContext>
+{
+    public override void Run(BuildContext context)
+    {
+        if (context.BuildSystem().IsRunningOnGitHubActions)
+        {
+            context.GitHubActions().Commands.SetOutputParameter("dockerDistros", context.SerializeJson(Constants.DockerDistros));
+            context.GitHubActions().Commands.SetOutputParameter("dotnetVersions", context.SerializeJson(Constants.DotnetVersions));
+        }
+        else
+        {
+            context.Information("Docker Distros: {0}", context.SerializeJson(Constants.DockerDistros));
+            context.Information("Dotnet Versions: {0}", context.SerializeJson(Constants.DotnetVersions));
+        }
+    }
+}
diff --git a/build/config/Tasks/TestMatrix.cs b/build/config/Tasks/TestMatrix.cs
deleted file mode 100644
index 248ad6e83b..0000000000
--- a/build/config/Tasks/TestMatrix.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-namespace Config.Tasks;
-
-[TaskName(nameof(TestMatrix))]
-[TaskDescription("Creates a test matrix")]
-public class TestMatrix : BaseMatrix
-{
-    public override void Run(BuildContext context) => OutputMatrix(context, new
-    {
-        DotnetVersion = Constants.DotnetVersions
-    });
-}