Skip to content

Commit 0a44b8d

Browse files
committed
(ci) removed test_arm64_artifacts input for _artifacts_linux
1 parent f5f5c02 commit 0a44b8d

File tree

6 files changed

+10
-27
lines changed

6 files changed

+10
-27
lines changed

.editorconfig

+6
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,10 @@ dotnet_diagnostic.CA1816.severity = warning
189189
# IDE0005: Using directive is unnecessary.
190190
dotnet_diagnostic.IDE0005.severity = warning
191191

192+
# RCS1037: Remove trailing white-space.
193+
dotnet_diagnostic.RCS1037.severity = error
194+
195+
# RCS1036: Remove redundant empty line.
196+
dotnet_diagnostic.RCS1036.severity = error
197+
192198
[resharper_]xml_space_before_self_closing = true

.github/workflows/_artifacts_linux.yml

+1-12
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
arch:
88
required: true
99
type: string
10-
test_arm64_artifacts:
11-
required: false
12-
type: boolean
13-
default: false
1410

1511
env:
1612
DOTNET_INSTALL_DIR: "./.dotnet"
@@ -47,14 +43,7 @@ jobs:
4743
with:
4844
name: native-${{ runner.os }}
4945
path: ${{ github.workspace }}/artifacts/packages/native
50-
-
51-
name: Echo
52-
shell: pwsh
53-
run: |
54-
Write-Host "Test ARM64 Artifacts: ${{ inputs.test_arm64_artifacts }}"
5546
-
5647
name: '[Test Artifacts]'
5748
shell: pwsh
58-
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
59-
env:
60-
TEST_ARM64_ARTIFACTS: ${{ inputs.test_arm64_artifacts }}
49+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ jobs:
6868
with:
6969
runner: ubuntu-latest
7070
arch: ${{ matrix.arch }}
71-
test_arm64_artifacts: false
7271

7372
docker_linux_images:
7473
needs: [ build ]

build/artifacts/BuildContext.cs

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ public class BuildContext : BuildContextBase
88

99
public bool IsDockerOnLinux { get; set; }
1010

11-
public bool TestArm64Artifacts { get; set; }
12-
13-
public Architecture? Architecture { get; set; }
14-
1511
public IEnumerable<DockerImage> Images { get; set; } = new List<DockerImage>();
1612

1713
public BuildContext(ICakeContext context) : base(context)

build/artifacts/BuildLifetime.cs

+3-4
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,21 @@ public override void Setup(BuildContext context, ISetupContext info)
1010
base.Setup(context, info);
1111

1212
context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
13-
context.TestArm64Artifacts = context.EnvironmentVariable("TEST_ARM64_ARTIFACTS", false);
1413

15-
context.Architecture = context.HasArgument(Arguments.Architecture) ? context.Argument<Architecture>(Arguments.Architecture) : null;
1614
var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
1715
var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
1816
var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
1917

2018
var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.VersionsToBuild : new[] { dotnetVersion };
2119
var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : new[] { dockerDistro };
2220

23-
var archs = context.Architecture.HasValue ? new[] { context.Architecture.Value } : Constants.ArchToBuild;
21+
var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
22+
2423

2524
var registry = dockerRegistry == DockerRegistry.DockerHub ? Constants.DockerHubRegistry : Constants.GitHubContainerRegistry;
2625
context.Images = from version in versions
2726
from distro in distros
28-
from arch in archs
27+
from arch in architectures
2928
select new DockerImage(distro, version, arch, registry, true);
3029

3130
context.StartGroup("Build Setup");

build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ public override bool ShouldRun(BuildContext context)
1414
{
1515
var shouldRun = true;
1616
shouldRun &= context.ShouldRun(context.IsDockerOnLinux, $"{nameof(ArtifactsMsBuildCoreTest)} works only on Docker on Linux agents.");
17-
18-
if (context.Architecture is Architecture.Arm64)
19-
{
20-
shouldRun &= context.ShouldRun(context.TestArm64Artifacts, $"{nameof(ArtifactsMsBuildCoreTest)} works only when TEST_ARM64_ARTIFACTS is enabled.");
21-
}
22-
2317
return shouldRun;
2418
}
2519

0 commit comments

Comments
 (0)