Skip to content

Commit 3aa07cc

Browse files
arturcicarturcic
committed
disable arm builds for now
1 parent 636cc72 commit 3aa07cc

File tree

13 files changed

+23
-48
lines changed

13 files changed

+23
-48
lines changed

‎.github/actions/docker-manifests/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ runs:
3232
-
3333
name: '[Docker Publish Manifests] DockerHub'
3434
shell: pwsh
35-
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
35+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
3636
-
3737
name: Login to GitHub
3838
uses: docker/login-action@v2
@@ -43,4 +43,4 @@ runs:
4343
-
4444
name: '[Docker Publish Manifests] GitHub'
4545
shell: pwsh
46-
run: dotnet run/docker.dll --target=DockerManifest --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
46+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/actions/docker-publish/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
-
3636
name: '[Docker Publish] DockerHub'
3737
shell: pwsh
38-
run: dotnet run/docker.dll --target=DockerPublish --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
38+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
3939
-
4040
name: Login to GitHub
4141
uses: docker/login-action@v2
@@ -46,4 +46,4 @@ runs:
4646
-
4747
name: '[Docker Publish] GitHub'
4848
shell: pwsh
49-
run: dotnet run/docker.dll --target=DockerPublish --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
49+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/actions/docker-test/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ runs:
1717
-
1818
name: '[Docker Build & Test] DockerHub'
1919
shell: pwsh
20-
run: dotnet run/docker.dll --target=DockerTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
20+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
2121
-
2222
name: '[Docker Build & Test] GitHub'
2323
shell: pwsh
24-
run: dotnet run/docker.dll --target=DockerTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
24+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github

‎.github/workflows/_artifacts_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ jobs:
5959
-
6060
name: '[Test Artifacts]'
6161
shell: pwsh
62-
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch ${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
62+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
6363
env:
6464
TEST_ARM64_ARTIFACTS: ${{ inputs.test_arm64_artifacts }}

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
arch: [ amd64, arm64 ]
65+
arch: [ amd64 ]
6666

6767
uses: ./.github/workflows/_artifacts_linux.yml
6868
with:
@@ -76,7 +76,7 @@ jobs:
7676
strategy:
7777
fail-fast: false
7878
matrix:
79-
arch: [ amd64, arm64 ]
79+
arch: [ amd64 ]
8080

8181
uses: ./.github/workflows/_docker.yml
8282
with:

‎build/.run/Docker Build.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Manifest.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Publish.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Test.run.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/common/Utilities/DockerContextExtensions.cs

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,13 @@ public static void DockerCreateManifest(this BuildContextBase context, DockerIma
8181
{
8282
var manifestCreateSettings = new DockerManifestCreateSettings { Amend = true };
8383
var amd64Tag = $"{tag}-{Architecture.Amd64.ToSuffix()}";
84+
var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
8485
if (skipArm64Image)
8586
{
8687
context.DockerManifestCreate(manifestCreateSettings, tag, amd64Tag);
8788
}
8889
else
8990
{
90-
var arm64Tag = $"{tag}-{Architecture.Arm64.ToSuffix()}";
9191
context.DockerManifestCreate(manifestCreateSettings, tag, amd64Tag, arm64Tag);
9292
}
9393
}
@@ -98,15 +98,15 @@ public static void DockerPushManifest(this BuildContextBase context, DockerImage
9898
var manifestTags = context.GetDockerTags(dockerImage);
9999
foreach (var tag in manifestTags)
100100
{
101-
context.DockerManifestPush(new DockerManifestPushSettings { Purge = true }, tag);
101+
context.DockerManifestPush(new() { Purge = true }, tag);
102102
}
103103
}
104104

105105
public static void DockerPullImage(this ICakeContext context, DockerImage dockerImage)
106106
{
107107
var tag = $"{dockerImage.DockerImageName()}:{dockerImage.Distro}-sdk-{dockerImage.TargetFramework}";
108108
var platform = $"linux/{dockerImage.Architecture.ToString().ToLower()}";
109-
context.DockerPull(new DockerImagePullSettings { Platform = platform }, tag);
109+
context.DockerPull(new() { Platform = platform }, tag);
110110
}
111111

112112
public static void DockerTestImage(this BuildContextBase context, DockerImage dockerImage)
@@ -124,10 +124,7 @@ public static void DockerTestArtifact(this BuildContextBase context, DockerImage
124124
context.DockerTestRun(tag, dockerImage.Architecture, "sh", cmd);
125125
}
126126

127-
private static void DockerBuild(
128-
this ICakeContext context,
129-
DockerImageBuildSettings settings,
130-
string path, params string[] args)
127+
private static void DockerBuild(this ICakeContext context, DockerImageBuildSettings settings, string path, params string[] args)
131128
{
132129
GenericDockerRunner<DockerImageBuildSettings> genericDockerRunner =
133130
new(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
@@ -235,27 +232,4 @@ private static DockerContainerRunSettings GetDockerRunSettings(this BuildContext
235232

236233
return settings;
237234
}
238-
/*private static string DockerRunImage(this ICakeContext context, DockerContainerRunSettings settings, string image, string command, params string[] args)
239-
{
240-
if (string.IsNullOrEmpty(image))
241-
{
242-
throw new ArgumentNullException(nameof(image));
243-
}
244-
var runner = new GenericDockerRunner<DockerContainerRunSettings>(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools);
245-
List<string> arguments = new()
246-
{
247-
image
248-
};
249-
if (!string.IsNullOrEmpty(command))
250-
{
251-
arguments.Add(command);
252-
if (args.Length > 0)
253-
{
254-
arguments.AddRange(args);
255-
}
256-
}
257-
258-
var result = runner.RunWithResult("run", settings, r => r.ToArray(), arguments.ToArray());
259-
return string.Join("\n", result);
260-
}*/
261235
}

0 commit comments

Comments
 (0)