Skip to content

Commit 2c76e70

Browse files
arturcicarturcic
committed
remove eol distros
1 parent 6185485 commit 2c76e70

File tree

12 files changed

+21
-23
lines changed

12 files changed

+21
-23
lines changed

‎.github/workflows/_artifacts_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ inputs.runner }}
1818
strategy:
1919
matrix:
20-
distro: [ alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.10, debian.11, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
20+
distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
2121
targetFramework: [ '7.0', '6.0' ]
2222
fail-fast: false
2323

‎.github/workflows/_docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ${{ inputs.runner }}
1818
strategy:
1919
matrix:
20-
distro: [ alpine.3.15, alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.10, debian.11, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
20+
distro: [ alpine.3.16, alpine.3.17, centos.7, centos.stream.8, fedora.36, debian.11, ubuntu.20.04, ubuntu.22.04 ]
2121
targetFramework: [ '7.0', '6.0' ]
2222
fail-fast: false
2323

@@ -59,4 +59,4 @@ jobs:
5959
docker_registry_username: ${{ secrets.DOCKER_USERNAME }}
6060
docker_registry_password: ${{ secrets.DOCKER_PASSWORD }}
6161
github_registry_username: ${{ github.repository_owner }}
62-
github_registry_password: ${{ secrets.DOCKER_GITHUB_TOKEN }}
62+
github_registry_password: ${{ secrets.DOCKER_GITHUB_TOKEN }}

‎build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Artifacts.Tasks;
66
[TaskDescription("Tests the dotnet global tool in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
1212
{

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Artifacts.Tasks;
66
[TaskDescription("Tests the msbuild package in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
1212
{
@@ -29,12 +29,12 @@ public override void Run(BuildContext context)
2929
{
3030
if (context.SkipImageForArtifacts(dockerImage)) continue;
3131

32-
string targetFramework = dockerImage.TargetFramework;
32+
var framework = dockerImage.TargetFramework;
3333

34-
targetFramework = targetFramework switch
34+
var targetFramework = framework switch
3535
{
36-
Constants.Version60 or Constants.Version70 => $"net{targetFramework}",
37-
_ => targetFramework
36+
Constants.Version60 or Constants.Version70 => $"net{framework}",
37+
_ => framework
3838
};
3939

4040
var cmd = $"{rootPrefix}/scripts/test-msbuild-task.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo/tests/integration --targetframework {targetFramework}";

‎build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Artifacts.Tasks;
66
[TaskDescription("Tests the native executables in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsNativeTest : FrostingTask<BuildContext>
1212
{

‎build/artifacts/Tasks/ArtifactsPrepare.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Artifacts.Tasks;
66
[TaskDescription("Pulls the docker images needed for testing the artifacts")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
public class ArtifactsPrepare : FrostingTask<BuildContext>
1111
{
1212
public override bool ShouldRun(BuildContext context)

‎build/artifacts/Tasks/ArtifactsTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Artifacts.Tasks;
66
[TaskDescription("Tests packages in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[IsDependentOn(typeof(ArtifactsNativeTest))]
1111
[IsDependentOn(typeof(ArtifactsDotnetToolTest))]
1212
[IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]

‎build/common/Utilities/Constants.cs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Constants
1818

1919
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
2020
public static readonly string[] VersionsToBuild = { Version60, Version70 };
21-
public static readonly string[] DistrosToSkipForArtifacts = { Alpine315, Alpine316, Alpine317, Centos7, Ubuntu2204 };
21+
public static readonly string[] DistrosToSkipForArtifacts = { Alpine316, Alpine317, Centos7, Ubuntu2204 };
2222
public static readonly string[] DistrosToSkipForDocker = { Centos7 };
2323

2424
public const string DockerBaseImageName = "gittools/build-images";
@@ -32,29 +32,27 @@ public class Constants
3232
public const string Arm64 = "arm64";
3333
public const string Amd64 = "amd64";
3434

35-
public const string Alpine315 = "alpine.3.15";
3635
public const string Alpine316 = "alpine.3.16";
3736
public const string Alpine317 = "alpine.3.17";
3837
public const string Centos7 = "centos.7";
3938
public const string CentosStream8 = "centos.stream.8";
4039
public const string Fedora36 = "fedora.36";
41-
public const string Debian10 = "debian.10";
4240
public const string Debian11 = "debian.11";
43-
public const string Ubuntu1804 = "ubuntu.18.04";
4441
public const string Ubuntu2004 = "ubuntu.20.04";
4542
public const string Ubuntu2204 = "ubuntu.22.04";
4643
public const string DockerDistroLatest = Debian11;
44+
public const string DebianLatest = Debian11;
45+
public const string UbuntuLatest = Ubuntu2204;
46+
public const string AlpineLatest = Alpine317;
47+
4748
public static readonly string[] DockerDistrosToBuild =
4849
{
49-
Alpine315,
5050
Alpine316,
5151
Alpine317,
5252
Centos7,
5353
CentosStream8,
5454
Fedora36,
55-
Debian10,
5655
Debian11,
57-
Ubuntu1804,
5856
Ubuntu2004,
5957
Ubuntu2204
6058
};

‎build/docker/Tasks/DockerBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Docker.Tasks;
66
[TaskDescription("Build the docker images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
public class DockerBuild : FrostingTask<BuildContext>
1212
{

‎build/docker/Tasks/DockerManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Docker.Tasks;
66
[TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60, Constants.Version70)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.AlpineLatest, Constants.DebianLatest, Constants.UbuntuLatest)]
1010
[IsDependentOn(typeof(DockerManifestInternal))]
1111
public class DockerManifest : FrostingTask<BuildContext>
1212
{

0 commit comments

Comments
 (0)