From 8428d404172c477cc72f364f1be2ded477890323 Mon Sep 17 00:00:00 2001 From: Artur Date: Sun, 16 Oct 2022 13:10:38 +0200 Subject: [PATCH] #3166 - drop .net core 3.1 support --- .github/workflows/ci.yml | 4 ++-- build/artifacts/Tasks/ArtifactsDotnetToolTest.cs | 2 +- build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs | 2 +- build/artifacts/Tasks/ArtifactsNativeTest.cs | 2 +- build/artifacts/Tasks/ArtifactsPrepare.cs | 2 +- build/artifacts/Tasks/ArtifactsTest.cs | 2 +- build/common/Utilities/Constants.cs | 6 +----- build/docker/Tasks/DockerBuild.cs | 2 +- build/docker/Tasks/DockerManifest.cs | 2 +- build/docker/Tasks/DockerPublish.cs | 2 +- build/docker/Tasks/DockerTest.cs | 2 +- 11 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f805905dac..d2c2196f8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -225,7 +225,7 @@ jobs: strategy: matrix: targetFramework: [ '6.0' ] - distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] + distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] fail-fast: false steps: @@ -289,7 +289,7 @@ jobs: strategy: matrix: targetFramework: [ '6.0' ] - distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] + distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ] fail-fast: false steps: diff --git a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs index d259ce9baf..c2d6da8c58 100644 --- a/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs +++ b/build/artifacts/Tasks/ArtifactsDotnetToolTest.cs @@ -6,7 +6,7 @@ namespace Artifacts.Tasks; [TaskDescription("Tests the dotnet global tool in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsDotnetToolTest : FrostingTask { diff --git a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs index eb643abcd4..2cd0feae16 100644 --- a/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs +++ b/build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs @@ -6,7 +6,7 @@ namespace Artifacts.Tasks; [TaskDescription("Tests the msbuild package in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsMsBuildCoreTest : FrostingTask { diff --git a/build/artifacts/Tasks/ArtifactsNativeTest.cs b/build/artifacts/Tasks/ArtifactsNativeTest.cs index a80614ab8c..09534ae36f 100644 --- a/build/artifacts/Tasks/ArtifactsNativeTest.cs +++ b/build/artifacts/Tasks/ArtifactsNativeTest.cs @@ -6,7 +6,7 @@ namespace Artifacts.Tasks; [TaskDescription("Tests the native executables in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsPrepare))] public class ArtifactsNativeTest : FrostingTask { diff --git a/build/artifacts/Tasks/ArtifactsPrepare.cs b/build/artifacts/Tasks/ArtifactsPrepare.cs index bc0580b28b..b30b05aee9 100644 --- a/build/artifacts/Tasks/ArtifactsPrepare.cs +++ b/build/artifacts/Tasks/ArtifactsPrepare.cs @@ -6,7 +6,7 @@ namespace Artifacts.Tasks; [TaskDescription("Pulls the docker images needed for testing the artifacts")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] public class ArtifactsPrepare : FrostingTask { public override bool ShouldRun(BuildContext context) diff --git a/build/artifacts/Tasks/ArtifactsTest.cs b/build/artifacts/Tasks/ArtifactsTest.cs index e3c75cd8cb..559bfe3ec6 100644 --- a/build/artifacts/Tasks/ArtifactsTest.cs +++ b/build/artifacts/Tasks/ArtifactsTest.cs @@ -6,7 +6,7 @@ namespace Artifacts.Tasks; [TaskDescription("Tests packages in docker container")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(ArtifactsNativeTest))] [IsDependentOn(typeof(ArtifactsDotnetToolTest))] [IsDependentOn(typeof(ArtifactsMsBuildCoreTest))] diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs index c579bbb16d..532107958a 100644 --- a/build/common/Utilities/Constants.cs +++ b/build/common/Utilities/Constants.cs @@ -11,7 +11,7 @@ public class Constants public static readonly string[] VersionsToBuild = { Version60 }; public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 }; - public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 }; + public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7 }; public const string DockerBaseImageName = "gittools/build-images"; public const string DockerImageName = "gittools/gitversion"; @@ -24,12 +24,10 @@ public class Constants public const string Arm64 = "arm64"; public const string Amd64 = "amd64"; - public const string Alpine312 = "alpine.3.12"; public const string Alpine313 = "alpine.3.13"; public const string Alpine314 = "alpine.3.14"; public const string Centos7 = "centos.7"; public const string Centos8 = "centos.8"; - public const string Debian9 = "debian.9"; public const string Debian10 = "debian.10"; public const string Debian11 = "debian.11"; public const string Fedora33 = "fedora.33"; @@ -39,12 +37,10 @@ public class Constants public const string DockerDistroLatest = Debian10; public static readonly string[] DockerDistrosToBuild = { - Alpine312, Alpine313, Alpine314, Centos7, Centos8, - Debian9, Debian10, Debian11, Fedora33, diff --git a/build/docker/Tasks/DockerBuild.cs b/build/docker/Tasks/DockerBuild.cs index 4adf62ad5c..9f866b326c 100644 --- a/build/docker/Tasks/DockerBuild.cs +++ b/build/docker/Tasks/DockerBuild.cs @@ -6,7 +6,7 @@ namespace Docker.Tasks; [TaskDescription("Build the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] public class DockerBuild : FrostingTask { diff --git a/build/docker/Tasks/DockerManifest.cs b/build/docker/Tasks/DockerManifest.cs index 318ba842c7..4d04efa413 100644 --- a/build/docker/Tasks/DockerManifest.cs +++ b/build/docker/Tasks/DockerManifest.cs @@ -6,7 +6,7 @@ namespace Docker.Tasks; [TaskDescription("Publish the docker manifest containing the images for amd64 and arm64")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [IsDependentOn(typeof(DockerManifestInternal))] public class DockerManifest : FrostingTask { diff --git a/build/docker/Tasks/DockerPublish.cs b/build/docker/Tasks/DockerPublish.cs index d4a9de9600..c5c15b8e3a 100644 --- a/build/docker/Tasks/DockerPublish.cs +++ b/build/docker/Tasks/DockerPublish.cs @@ -6,7 +6,7 @@ namespace Docker.Tasks; [TaskDescription("Publish the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerPublishInternal))] public class DockerPublish : FrostingTask diff --git a/build/docker/Tasks/DockerTest.cs b/build/docker/Tasks/DockerTest.cs index ce334be0f5..dd86824cd4 100644 --- a/build/docker/Tasks/DockerTest.cs +++ b/build/docker/Tasks/DockerTest.cs @@ -6,7 +6,7 @@ namespace Docker.Tasks; [TaskDescription("Test the docker images containing the GitVersion Tool")] [TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)] [TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)] -[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)] +[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)] [TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)] [IsDependentOn(typeof(DockerBuild))] public class DockerTest : FrostingTask