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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ 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 @@
-
+
-
+
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
-{
- 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
+{
+ 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
- });
-}