Merge pull request #3852 from arturcic/main

arturcic · arturcic · commit 0debb9928190 · 2023-12-29T05:44:43.000+01:00
Arm64 - disable testing the artifacts as well as the docker images for Arm64
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
@@ -37,6 +37,16 @@ jobs:
       with:
         name: nuget
         path: ${{ github.workspace }}/artifacts/packages/nuget
+    -
+      name: Setup QEMU
+      if: inputs.arch == 'arm64'
+      uses: docker/setup-qemu-action@v3
+    -
+      name: Setup Docker Buildx
+      if: inputs.arch == 'arm64'
+      uses: docker/setup-buildx-action@v3
+      with:
+        install: true      
     -
       name: Docker Test
       if: success() && github.event_name == 'pull_request' || github.repository_owner != 'GitTools'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -62,11 +62,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ amd64, amd64 ]
-
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: ubuntu-latest
     uses: ./.github/workflows/_artifacts_linux.yml
     with:
-      runner: ubuntu-latest
+      runner: ${{ matrix.runner }}
       arch: ${{ matrix.arch }}
 
   docker_linux_images:
@@ -75,11 +78,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [ amd64, amd64 ]
+        include:
+          - arch: amd64
+            runner: ubuntu-latest
+          - arch: arm64
+            runner: ubuntu-latest
 
     uses: ./.github/workflows/_docker.yml
     with:
-      runner: ubuntu-latest
+      runner: ${{ matrix.runner }}
       arch: ${{ matrix.arch }}
     secrets: inherit
 
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
@@ -19,7 +19,7 @@ public override void Setup(BuildContext context, ISetupContext info)
         var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : [dockerDistro];
 
         var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
-
+        var platformArch = context.IsRunningOnAmd64() ? Architecture.Amd64 : Architecture.Arm64;
 
         var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
         context.Images = from version in versions
@@ -32,7 +32,8 @@ from arch in architectures
         LogBuildInformation(context);
 
         context.Information($"IsDockerOnLinux:      {context.IsDockerOnLinux}");
-        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
+        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}, Architecture: {platformArch}");
+
         context.EndGroup();
     }
 }
diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs
@@ -27,7 +27,7 @@ public override void Run(BuildContext context)
 
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForArtifacts(dockerImage)) continue;
+            if (context.SkipImageTesting(dockerImage)) continue;
 
             var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";
 
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs
@@ -26,7 +26,7 @@ public override void Run(BuildContext context)
 
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForArtifacts(dockerImage)) continue;
+            if (context.SkipImageTesting(dockerImage)) continue;
 
             var framework = dockerImage.TargetFramework;
 
diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs
@@ -27,7 +27,7 @@ public override void Run(BuildContext context)
 
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForArtifacts(dockerImage)) continue;
+            if (context.SkipImageTesting(dockerImage)) continue;
 
             var runtime = "linux";
             if (dockerImage.Distro.StartsWith("alpine"))
diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs
@@ -21,7 +21,7 @@ public override void Run(BuildContext context)
     {
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForArtifacts(dockerImage)) continue;
+            if (context.SkipImageTesting(dockerImage)) continue;
             context.DockerPullImage(dockerImage);
         }
     }
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
@@ -22,9 +22,6 @@ public class Constants
     public static readonly string[] VersionsToBuild = [Version60, Version70, Version80];
     public static readonly string[] Frameworks = [NetVersion60, NetVersion70, NetVersion80];
 
-    public static readonly string[] DistrosToSkipForArtifacts = [];
-    public static readonly string[] DistrosToSkipForDocker = [];
-
     public const string DockerBaseImageName = "gittools/build-images";
     public const string DockerImageName = "gittools/gitversion";
 
diff --git a/build/common/Utilities/ContextExtensions.cs b/build/common/Utilities/ContextExtensions.cs
@@ -1,5 +1,7 @@
+using System.Runtime.InteropServices;
 using Cake.Common.Build.AzurePipelines;
 using Xunit;
+using ProcessArchitecture = System.Runtime.InteropServices.Architecture;
 
 namespace Common.Utilities;
 
@@ -12,6 +14,7 @@ public static IEnumerable<string> ExecuteCommand(this ICakeContext context, File
         {
             processSettings.WorkingDirectory = workDir;
         }
+
         context.StartProcess(exe, processSettings, out var redirectedOutput);
         return redirectedOutput.ToList();
     }
@@ -79,6 +82,12 @@ public static string GetOS(this ICakeContext context)
         return string.Empty;
     }
 
+    public static bool IsRunningOnAmd64(this ICakeContext _)
+        => RuntimeInformation.ProcessArchitecture == ProcessArchitecture.X64;
+
+    public static bool IsRunningOnArm64(this ICakeContext _) =>
+        RuntimeInformation.ProcessArchitecture == ProcessArchitecture.Arm64;
+
     public static string GetBuildAgent(this ICakeContext context)
     {
         var buildSystem = context.BuildSystem();
@@ -142,6 +151,7 @@ public static string GetBranchName(this ICakeContext context)
         {
             repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");
         }
+
         return repositoryBranch;
     }
 
@@ -161,6 +171,7 @@ public static string GetRepositoryName(this ICakeContext context)
         {
             repositoryName = buildSystem.GitHubActions.Environment.Workflow.Repository;
         }
+
         return repositoryName;
     }
 
@@ -172,6 +183,7 @@ public static string GetRepositoryName(this ICakeContext context)
         context.GetFiles($"src/GitVersion.App/bin/{Constants.DefaultConfiguration}/{Constants.NetVersionLatest}/gitversion.dll").SingleOrDefault();
     public static FilePath? GetGitVersionDotnetToolLocation(this ICakeContext context) =>
         context.MakeAbsolute(Paths.Tools.Combine("gitversion").CombineWithFilePath("gitversion.dll"));
+
     public static FilePath? GetSchemaDotnetToolLocation(this ICakeContext context) =>
         context.MakeAbsolute(Paths.Tools.Combine("schema").CombineWithFilePath("schema.dll"));
 }
diff --git a/build/common/Utilities/DockerContextExtensions.cs b/build/common/Utilities/DockerContextExtensions.cs
@@ -10,26 +10,19 @@ public enum Architecture
 
 public static class DockerContextExtensions
 {
-    public static bool SkipImageForArtifacts(this ICakeContext context, DockerImage dockerImage)
+    public static bool SkipImageTesting(this ICakeContext context, DockerImage dockerImage)
     {
         var (distro, targetFramework, architecture, _, _) = dockerImage;
 
-        if (architecture == Architecture.Amd64) return false;
-        if (!Constants.DistrosToSkipForArtifacts.Contains(distro)) return false;
-
-        context.Information($"Skipping Target: {targetFramework}, Distro: {distro}, Arch: {architecture}");
-        return true;
-    }
-
-    public static bool SkipImageForDocker(this ICakeContext context, DockerImage dockerImage)
-    {
-        var (distro, targetFramework, architecture, _, _) = dockerImage;
-
-        if (architecture == Architecture.Amd64) return false;
-        if (!Constants.DistrosToSkipForDocker.Contains(distro)) return false;
-
-        context.Information($"Skipping Target: {targetFramework}, Distro: {distro}, Arch: {architecture}");
-        return true;
+        switch (architecture)
+        {
+            case Architecture.Amd64:
+            case Architecture.Arm64 when context.IsRunningOnArm64():
+                return false;
+            default:
+                context.Information($"Skipping Target: {targetFramework}, Distro: {distro}, Arch: {architecture}");
+                return true;
+        }
     }
 
     public static void DockerBuildImage(this BuildContextBase context, DockerImage dockerImage)
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
@@ -14,15 +14,18 @@ public override void Setup(BuildContext context, ISetupContext info)
 
         context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
 
-        var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
         var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
         var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
         var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
         var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : [dotnetVersion];
         var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : [dockerDistro];
 
+        var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
+        var platformArch = context.IsRunningOnAmd64() ? Architecture.Amd64 : Architecture.Arm64;
+
         var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
+
         context.DockerRegistry = dockerRegistry;
         context.Architectures = architectures;
         context.Images = from version in versions
@@ -35,7 +38,7 @@ from arch in architectures
         LogBuildInformation(context);
 
         context.Information($"IsDockerOnLinux:      {context.IsDockerOnLinux}");
-        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}");
+        context.Information($"Building for Version: {dotnetVersion}, Distro: {dockerDistro}, Architecture: {platformArch}");
         context.EndGroup();
     }
 }
diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs
@@ -27,7 +27,6 @@ public override void Run(BuildContext context)
 
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForDocker(dockerImage)) continue;
             context.DockerBuildImage(dockerImage);
         }
     }
diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs
@@ -45,7 +45,6 @@ public override void Run(BuildContext context)
     {
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForDocker(dockerImage)) continue;
             context.DockerPushImage(dockerImage);
         }
     }
diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
     {
         foreach (var dockerImage in context.Images)
         {
-            if (context.SkipImageForDocker(dockerImage)) continue;
+            if (context.SkipImageTesting(dockerImage)) continue;
             context.DockerTestImage(dockerImage);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public override void Run(BuildContext context)`
`27`	`27`
`28`	`28`	`foreach (var dockerImage in context.Images)`
`29`	`29`	`{`
`30`		`- if (context.SkipImageForArtifacts(dockerImage)) continue;`
	`30`	`+ if (context.SkipImageTesting(dockerImage)) continue;`
`31`	`31`
`32`	`32`	`var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public override void Run(BuildContext context)`
`26`	`26`
`27`	`27`	`foreach (var dockerImage in context.Images)`
`28`	`28`	`{`
`29`		`- if (context.SkipImageForArtifacts(dockerImage)) continue;`
	`29`	`+ if (context.SkipImageTesting(dockerImage)) continue;`
`30`	`30`
`31`	`31`	`var framework = dockerImage.TargetFramework;`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public override void Run(BuildContext context)`
`21`	`21`	`{`
`22`	`22`	`foreach (var dockerImage in context.Images)`
`23`	`23`	`{`
`24`		`- if (context.SkipImageForArtifacts(dockerImage)) continue;`
	`24`	`+ if (context.SkipImageTesting(dockerImage)) continue;`
`25`	`25`	`context.DockerPullImage(dockerImage);`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
	`1`	`+using System.Runtime.InteropServices;`
`1`	`2`	`using Cake.Common.Build.AzurePipelines;`
`2`	`3`	`using Xunit;`
	`4`	`+using ProcessArchitecture = System.Runtime.InteropServices.Architecture;`
`3`	`5`
`4`	`6`	`namespace Common.Utilities;`
`5`	`7`
`@@ -12,6 +14,7 @@ public static IEnumerable<string> ExecuteCommand(this ICakeContext context, File`
`12`	`14`	`{`
`13`	`15`	`processSettings.WorkingDirectory = workDir;`
`14`	`16`	`}`
	`17`	`+`
`15`	`18`	`context.StartProcess(exe, processSettings, out var redirectedOutput);`
`16`	`19`	`return redirectedOutput.ToList();`
`17`	`20`	`}`
`@@ -79,6 +82,12 @@ public static string GetOS(this ICakeContext context)`
`79`	`82`	`return string.Empty;`
`80`	`83`	`}`
`81`	`84`
	`85`	`+ public static bool IsRunningOnAmd64(this ICakeContext _)`
	`86`	`+ => RuntimeInformation.ProcessArchitecture == ProcessArchitecture.X64;`
	`87`	`+`
	`88`	`+ public static bool IsRunningOnArm64(this ICakeContext _) =>`
	`89`	`+ RuntimeInformation.ProcessArchitecture == ProcessArchitecture.Arm64;`
	`90`	`+`
`82`	`91`	`public static string GetBuildAgent(this ICakeContext context)`
`83`	`92`	`{`
`84`	`93`	`var buildSystem = context.BuildSystem();`
`@@ -142,6 +151,7 @@ public static string GetBranchName(this ICakeContext context)`
`142`	`151`	`{`
`143`	`152`	`repositoryBranch = buildSystem.GitHubActions.Environment.Workflow.Ref.Replace("refs/heads/", "");`
`144`	`153`	`}`
	`154`	`+`
`145`	`155`	`return repositoryBranch;`
`146`	`156`	`}`
`147`	`157`
`@@ -161,6 +171,7 @@ public static string GetRepositoryName(this ICakeContext context)`
`161`	`171`	`{`
`162`	`172`	`repositoryName = buildSystem.GitHubActions.Environment.Workflow.Repository;`
`163`	`173`	`}`
	`174`	`+`
`164`	`175`	`return repositoryName;`
`165`	`176`	`}`
`166`	`177`
`@@ -172,6 +183,7 @@ public static string GetRepositoryName(this ICakeContext context)`
`172`	`183`	`context.GetFiles($"src/GitVersion.App/bin/{Constants.DefaultConfiguration}/{Constants.NetVersionLatest}/gitversion.dll").SingleOrDefault();`
`173`	`184`	`public static FilePath? GetGitVersionDotnetToolLocation(this ICakeContext context) =>`
`174`	`185`	`context.MakeAbsolute(Paths.Tools.Combine("gitversion").CombineWithFilePath("gitversion.dll"));`
	`186`	`+`
`175`	`187`	`public static FilePath? GetSchemaDotnetToolLocation(this ICakeContext context) =>`
`176`	`188`	`context.MakeAbsolute(Paths.Tools.Combine("schema").CombineWithFilePath("schema.dll"));`
`177`	`189`	`}`