Skip to content

Arm64 - disable testing the artifacts as well as the docker images for Arm64 (2) #3853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2023
Merged

Arm64 - disable testing the artifacts as well as the docker images for Arm64 (2) #3853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,14 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [ amd64, arm64 ]

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:
Expand All @@ -75,11 +78,15 @@ jobs:
strategy:
fail-fast: false
matrix:
arch: [ amd64, arm64 ]
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

Expand Down
5 changes: 3 additions & 2 deletions build/artifacts/BuildLifetime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
}
7 changes: 5 additions & 2 deletions build/docker/BuildLifetime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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();
}
}
3 changes: 1 addition & 2 deletions build/docker/Tasks/DockerManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ public override void Run(BuildContext context)
foreach (var group in context.Images.GroupBy(x => new { x.Distro, x.TargetFramework }))
{
var amd64DockerImage = group.First(x => x.Architecture == Architecture.Amd64);
var skipArm64 = context.Architectures.Contains(Architecture.Arm64);
context.DockerCreateManifest(amd64DockerImage, skipArm64);
context.DockerCreateManifest(amd64DockerImage);
context.DockerPushManifest(amd64DockerImage);
}
}
Expand Down