Skip to content

Commit 8428d40

Browse files
arturcicarturcic
committed
#3166 - drop .net core 3.1 support
1 parent 820c960 commit 8428d40

File tree

11 files changed

+12
-16
lines changed

11 files changed

+12
-16
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
strategy:
226226
matrix:
227227
targetFramework: [ '6.0' ]
228-
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 ]
228+
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 ]
229229
fail-fast: false
230230

231231
steps:
@@ -289,7 +289,7 @@ jobs:
289289
strategy:
290290
matrix:
291291
targetFramework: [ '6.0' ]
292-
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 ]
292+
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 ]
293293
fail-fast: false
294294

295295
steps:

‎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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
1212
{

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.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 msbuild package in docker container")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
1212
{

‎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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(ArtifactsNativeTest))]
1111
[IsDependentOn(typeof(ArtifactsDotnetToolTest))]
1212
[IsDependentOn(typeof(ArtifactsMsBuildCoreTest))]

‎build/common/Utilities/Constants.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class Constants
1111

1212
public static readonly string[] VersionsToBuild = { Version60 };
1313
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
14-
public static readonly string[] DistrosToSkip = { Alpine312, Alpine313, Alpine314, Centos7 };
14+
public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7 };
1515

1616
public const string DockerBaseImageName = "gittools/build-images";
1717
public const string DockerImageName = "gittools/gitversion";
@@ -24,12 +24,10 @@ public class Constants
2424
public const string Arm64 = "arm64";
2525
public const string Amd64 = "amd64";
2626

27-
public const string Alpine312 = "alpine.3.12";
2827
public const string Alpine313 = "alpine.3.13";
2928
public const string Alpine314 = "alpine.3.14";
3029
public const string Centos7 = "centos.7";
3130
public const string Centos8 = "centos.8";
32-
public const string Debian9 = "debian.9";
3331
public const string Debian10 = "debian.10";
3432
public const string Debian11 = "debian.11";
3533
public const string Fedora33 = "fedora.33";
@@ -39,12 +37,10 @@ public class Constants
3937
public const string DockerDistroLatest = Debian10;
4038
public static readonly string[] DockerDistrosToBuild =
4139
{
42-
Alpine312,
4340
Alpine313,
4441
Alpine314,
4542
Centos7,
4643
Centos8,
47-
Debian9,
4844
Debian10,
4945
Debian11,
5046
Fedora33,

‎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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
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)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[IsDependentOn(typeof(DockerManifestInternal))]
1111
public class DockerManifest : FrostingTask<BuildContext>
1212
{

‎build/docker/Tasks/DockerPublish.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 images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
[IsDependentOn(typeof(DockerPublishInternal))]
1212
public class DockerPublish : FrostingTask<BuildContext>

‎build/docker/Tasks/DockerTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace Docker.Tasks;
66
[TaskDescription("Test the docker images containing the GitVersion Tool")]
77
[TaskArgument(Arguments.DockerRegistry, Constants.DockerHub, Constants.GitHub)]
88
[TaskArgument(Arguments.DockerDotnetVersion, Constants.Version60)]
9-
[TaskArgument(Arguments.DockerDistro, Constants.Alpine312, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
1010
[TaskArgument(Arguments.Architecture, Constants.Amd64, Constants.Arm64)]
1111
[IsDependentOn(typeof(DockerBuild))]
1212
public class DockerTest : FrostingTask<BuildContext>

0 commit comments

Comments
 (0)