Skip to content

Commit 10150db

Browse files
arturcicarturcic
committed
updated the list of distros, removed the end of support
1 parent 926c38d commit 10150db

File tree

15 files changed

+90
-51
lines changed

15 files changed

+90
-51
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
name: Setup .NET SDK
5959
uses: actions/[email protected]
6060
with:
61-
dotnet-version: '7.0.102'
61+
dotnet-version: '7.0.x'
6262
-
6363
name: '[Prepare]'
6464
if: steps.cache-cake.outputs.cache-hit != 'true'
@@ -75,7 +75,7 @@ jobs:
7575
path: ${{ github.workspace }}/dogfood
7676

7777
build:
78-
name: Build code & Package
78+
name: Build & Package
7979
needs: [prepare]
8080
runs-on: ${{ matrix.os }}
8181
strategy:
@@ -113,7 +113,7 @@ jobs:
113113
name: Setup .NET SDK
114114
uses: actions/[email protected]
115115
with:
116-
dotnet-version: '7.0.102'
116+
dotnet-version: '7.0.x'
117117
-
118118
name: '[Build]'
119119
shell: pwsh
@@ -141,7 +141,7 @@ jobs:
141141
path: ${{ github.workspace }}/artifacts/packages/native/*.tar.gz
142142

143143
unit_test:
144-
name: Unit Test code
144+
name: Test
145145
needs: [prepare]
146146
runs-on: ${{ matrix.os }}
147147
env:
@@ -182,7 +182,7 @@ jobs:
182182
name: Setup .NET SDK
183183
uses: actions/[email protected]
184184
with:
185-
dotnet-version: '7.0.102'
185+
dotnet-version: '7.0.x'
186186
-
187187
name: '[Unit Test]'
188188
shell: pwsh
@@ -196,7 +196,7 @@ jobs:
196196
if: always()
197197

198198
artifacts_windows_test:
199-
name: Test artifacts on windows
199+
name: Artifacts
200200
needs: [build]
201201
runs-on: windows-latest
202202
strategy:
@@ -240,20 +240,20 @@ jobs:
240240
name: Setup .NET SDK
241241
uses: actions/[email protected]
242242
with:
243-
dotnet-version: '7.0.102'
243+
dotnet-version: '7.0.x'
244244
-
245245
name: '[Test Artifacts]'
246246
shell: pwsh
247247
run: dotnet run/artifacts.dll --target=Artifacts${{ matrix.package }}Test
248248

249249
artifacts_linux_test:
250-
name: Test artifacts in docker
250+
name: Artifacts
251251
needs: [build]
252252
runs-on: ubuntu-latest
253253
strategy:
254254
matrix:
255255
targetFramework: [ '7.0', '6.0' ]
256-
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 ]
256+
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 ]
257257
fail-fast: false
258258

259259
steps:
@@ -306,7 +306,7 @@ jobs:
306306
name: Setup .NET SDK
307307
uses: actions/[email protected]
308308
with:
309-
dotnet-version: '7.0.102'
309+
dotnet-version: '7.0.x'
310310
-
311311
name: '[Test Artifacts (amd64)]'
312312
shell: pwsh
@@ -317,13 +317,13 @@ jobs:
317317
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch arm64 --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
318318

319319
docker_linux_images:
320-
name: Build, Test and Publish Docker Images
320+
name: Docker Images
321321
needs: [build]
322322
runs-on: ubuntu-latest
323323
strategy:
324324
matrix:
325325
targetFramework: [ '7.0', '6.0' ]
326-
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 ]
326+
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 ]
327327
fail-fast: false
328328

329329
steps:
@@ -370,7 +370,7 @@ jobs:
370370
name: Setup .NET SDK
371371
uses: actions/[email protected]
372372
with:
373-
dotnet-version: '7.0.102'
373+
dotnet-version: '7.0.x'
374374
-
375375
name: Login to DockerHub
376376
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools'
@@ -466,7 +466,7 @@ jobs:
466466
name: Setup .NET SDK
467467
uses: actions/[email protected]
468468
with:
469-
dotnet-version: '7.0.102'
469+
dotnet-version: '7.0.x'
470470
-
471471
name: '[Publish]'
472472
shell: pwsh
@@ -526,7 +526,7 @@ jobs:
526526
name: Setup .NET SDK
527527
uses: actions/[email protected]
528528
with:
529-
dotnet-version: '7.0.102'
529+
dotnet-version: '7.0.x'
530530
-
531531
name: '[Release]'
532532
shell: pwsh

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222

2323
permissions:
2424
contents: read
25+
env:
26+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
27+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
28+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
29+
DOTNET_NOLOGO: 1
2530

2631
jobs:
2732
analyze:
@@ -61,7 +66,7 @@ jobs:
6166
name: Setup .NET SDK
6267
uses: actions/[email protected]
6368
with:
64-
dotnet-version: '7.0.102'
69+
dotnet-version: '7.0.x'
6570

6671
-
6772
name: '[Prepare]'

‎.github/workflows/docs.yml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ on:
2626
- .github/workflows/docs.yml
2727
env:
2828
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
29+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
30+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
31+
DOTNET_NOLOGO: 1
2932

3033
jobs:
3134
prepare:
@@ -75,12 +78,19 @@ jobs:
7578
name: Setup .NET SDK
7679
uses: actions/[email protected]
7780
with:
78-
dotnet-version: '7.0.102'
81+
dotnet-version: '7.0.x'
7982
-
8083
name: '[Prepare]'
8184
if: steps.cache-cake.outputs.cache-hit != 'true'
82-
run: dotnet build build/CI.sln --configuration=Release
83-
85+
run: |
86+
dotnet build build/CI.sln --configuration=Release
87+
dotnet run/build.dll --target=BuildPrepare
88+
-
89+
name: 'Upload gitversion tool'
90+
uses: actions/upload-artifact@v3
91+
with:
92+
name: tool
93+
path: ${{ github.workspace }}/dogfood
8494
validate:
8595
name: Validates Html
8696
needs: [prepare]
@@ -109,7 +119,13 @@ jobs:
109119
name: Setup .NET SDK
110120
uses: actions/[email protected]
111121
with:
112-
dotnet-version: '7.0.102'
122+
dotnet-version: '7.0.x'
123+
-
124+
uses: actions/download-artifact@v3
125+
name: Download gitversion tool
126+
with:
127+
name: tool
128+
path: ${{ github.workspace }}/dogfood
113129
-
114130
name: '[Build Documentation]'
115131
shell: pwsh
@@ -164,7 +180,7 @@ jobs:
164180
name: Setup .NET SDK
165181
uses: actions/[email protected]
166182
with:
167-
dotnet-version: '7.0.102'
183+
dotnet-version: '7.0.x'
168184
-
169185
name: '[Publish Documentation]'
170186
if: ${{ github.event_name == 'push' }}

‎.github/workflows/format.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ on:
2222
permissions:
2323
contents: read
2424

25+
env:
26+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2
27+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
28+
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
29+
DOTNET_NOLOGO: 1
30+
2531
jobs:
2632
format:
2733
runs-on: windows-latest

‎build/artifacts/Tasks/ArtifactsDotnetToolTest.cs‎

Lines changed: 2 additions & 2 deletions
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.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsDotnetToolTest : FrostingTask<BuildContext>
1212
{
@@ -27,7 +27,7 @@ public override void Run(BuildContext context)
2727

2828
foreach (var dockerImage in context.Images)
2929
{
30-
if (context.SkipImage(dockerImage)) continue;
30+
if (context.SkipImageForArtifacts(dockerImage)) continue;
3131

3232
var cmd = $"{rootPrefix}/scripts/test-global-tool.sh --version {version} --nugetPath {rootPrefix}/nuget --repoPath {rootPrefix}/repo";
3333

‎build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs‎

Lines changed: 2 additions & 2 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.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsMsBuildCoreTest : FrostingTask<BuildContext>
1212
{
@@ -27,7 +27,7 @@ public override void Run(BuildContext context)
2727

2828
foreach (var dockerImage in context.Images)
2929
{
30-
if (context.SkipImage(dockerImage)) continue;
30+
if (context.SkipImageForArtifacts(dockerImage)) continue;
3131

3232
string targetFramework = dockerImage.TargetFramework;
3333

‎build/artifacts/Tasks/ArtifactsNativeTest.cs‎

Lines changed: 2 additions & 2 deletions
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.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
1010
[IsDependentOn(typeof(ArtifactsPrepare))]
1111
public class ArtifactsNativeTest : FrostingTask<BuildContext>
1212
{
@@ -27,7 +27,7 @@ public override void Run(BuildContext context)
2727

2828
foreach (var dockerImage in context.Images)
2929
{
30-
if (context.SkipImage(dockerImage)) continue;
30+
if (context.SkipImageForArtifacts(dockerImage)) continue;
3131

3232
var runtime = dockerImage.Architecture == Architecture.Amd64 ? "linux-x64" : "linux-arm64";
3333
if (dockerImage.Distro.StartsWith("alpine"))

‎build/artifacts/Tasks/ArtifactsPrepare.cs‎

Lines changed: 2 additions & 2 deletions
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.Alpine313, Constants.Debian10, Constants.Ubuntu2004)]
9+
[TaskArgument(Arguments.DockerDistro, Constants.Alpine315, Constants.Debian11, Constants.Ubuntu2204)]
1010
public class ArtifactsPrepare : FrostingTask<BuildContext>
1111
{
1212
public override bool ShouldRun(BuildContext context)
@@ -21,7 +21,7 @@ public override void Run(BuildContext context)
2121
{
2222
foreach (var dockerImage in context.Images)
2323
{
24-
if (context.SkipImage(dockerImage)) continue;
24+
if (context.SkipImageForArtifacts(dockerImage)) continue;
2525
context.DockerPullImage(dockerImage);
2626
}
2727
}

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

‎build/common/Utilities/Constants.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ public class Constants
1616
public const string DefaultBranch = "main";
1717
public const string DefaultConfiguration = "Release";
1818

19-
public static readonly string[] VersionsToBuild = { Version60, Version70 };
2019
public static readonly Architecture[] ArchToBuild = { Architecture.Amd64, Architecture.Arm64 };
21-
public static readonly string[] DistrosToSkip = { Alpine313, Alpine314, Centos7, Ubuntu2204 };
20+
public static readonly string[] VersionsToBuild = { Version60, Version70 };
21+
public static readonly string[] DistrosToSkipForArtifacts = { Alpine315, Alpine316, Alpine317, Centos7 };
22+
public static readonly string[] DistrosToSkipForDocker = { Centos7 };
2223

2324
public const string DockerBaseImageName = "gittools/build-images";
2425
public const string DockerImageName = "gittools/gitversion";
@@ -31,28 +32,28 @@ public class Constants
3132
public const string Arm64 = "arm64";
3233
public const string Amd64 = "amd64";
3334

34-
public const string Alpine313 = "alpine.3.13";
35-
public const string Alpine314 = "alpine.3.14";
3635
public const string Alpine315 = "alpine.3.15";
36+
public const string Alpine316 = "alpine.3.16";
37+
public const string Alpine317 = "alpine.3.17";
3738
public const string Centos7 = "centos.7";
38-
public const string Centos8 = "centos.8";
39+
public const string CentosStream8 = "centos.stream.8";
40+
public const string Fedora36 = "fedora.36";
3941
public const string Debian10 = "debian.10";
4042
public const string Debian11 = "debian.11";
41-
public const string Fedora33 = "fedora.33";
4243
public const string Ubuntu1804 = "ubuntu.18.04";
4344
public const string Ubuntu2004 = "ubuntu.20.04";
4445
public const string Ubuntu2204 = "ubuntu.22.04";
4546
public const string DockerDistroLatest = Debian11;
4647
public static readonly string[] DockerDistrosToBuild =
4748
{
48-
Alpine313,
49-
Alpine314,
5049
Alpine315,
50+
Alpine316,
51+
Alpine317,
5152
Centos7,
52-
Centos8,
53+
CentosStream8,
54+
Fedora36,
5355
Debian10,
5456
Debian11,
55-
Fedora33,
5657
Ubuntu1804,
5758
Ubuntu2004,
5859
Ubuntu2204

0 commit comments

Comments
 (0)