Skip to content

Commit f627d76

Browse files
arturcicarturcic
committed
(build) use dotnet_version and docker_distro
1 parent bca6e18 commit f627d76

30 files changed

+108
-69
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: 'Docker Manifests'
22
description: 'Docker Publish Manifests'
33
inputs:
4-
distro:
4+
dockerDistro:
55
description: 'Linux Distro'
66
required: true
7-
targetFramework:
7+
dotnetVersion:
88
description: '.net version'
99
required: true
1010
docker_registry_username:
@@ -32,7 +32,7 @@ runs:
3232
-
3333
name: '[Docker Publish Manifests] DockerHub'
3434
shell: pwsh
35-
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
35+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub
3636
-
3737
name: Login to GitHub
3838
uses: docker/login-action@v3
@@ -43,4 +43,4 @@ runs:
4343
-
4444
name: '[Docker Publish Manifests] GitHub'
4545
shell: pwsh
46-
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
46+
run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ inputs:
44
arch:
55
description: 'Docker architecture'
66
required: true
7-
distro:
7+
dockerDistro:
88
description: 'Linux Distro'
99
required: true
10-
targetFramework:
10+
dotnetVersion:
1111
description: '.net version'
1212
required: true
1313
docker_registry_username:
@@ -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 --verbosity=diagnostic
38+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
3939
-
4040
name: Login to GitHub
4141
uses: docker/login-action@v3
@@ -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 --verbosity=diagnostic
49+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ inputs:
44
arch:
55
description: 'Docker architecture'
66
default: 'amd64'
7-
distro:
7+
dockerDistro:
88
description: 'Linux Distro'
99
default: 'debian.12'
10-
targetFramework:
10+
dotnetVersion:
1111
description: '.net version'
1212
default: '8.0'
1313

@@ -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 --verbosity=diagnostic
20+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
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 --verbosity=diagnostic
24+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic

‎.github/workflows/_artifacts_linux.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ env:
1414

1515
jobs:
1616
artifacts:
17-
name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
17+
name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
1818
runs-on: ${{ inputs.runner }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
distro:
22+
dockerDistro:
2323
- alpine.3.20
2424
- centos.stream.9
2525
- debian.12
2626
- fedora.40
2727
- ubuntu.20.04
2828
- ubuntu.22.04
2929
- ubuntu.24.04
30-
targetFramework: [ '8.0', '6.0' ]
30+
dotnetVersion: [ '8.0', '6.0' ]
3131

3232
steps:
3333
-
@@ -53,4 +53,4 @@ jobs:
5353
-
5454
name: '[Test Artifacts]'
5555
shell: pwsh
56-
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
56+
run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --dotnet_version=${{ matrix.dotnetVersion }} --docker_distro=${{ matrix.dockerDistro }}

‎.github/workflows/_docker.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ env:
1414

1515
jobs:
1616
docker:
17-
name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
17+
name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
1818
runs-on: ${{ inputs.runner }}
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
distro:
22+
dockerDistro:
2323
- alpine.3.20
2424
- centos.stream.9
2525
- debian.12
2626
- fedora.40
2727
- ubuntu.20.04
2828
- ubuntu.22.04
2929
- ubuntu.24.04
30-
targetFramework: [ '8.0', '6.0' ]
30+
dotnetVersion: [ '8.0', '6.0' ]
3131

3232
steps:
3333
-
@@ -65,16 +65,16 @@ jobs:
6565
uses: ./.github/actions/docker-test
6666
with:
6767
arch: ${{ inputs.arch }}
68-
distro: ${{ matrix.distro }}
69-
targetFramework: ${{ matrix.targetFramework }}
68+
dockerDistro: ${{ matrix.dockerDistro }}
69+
dotnetVersion: ${{ matrix.dotnetVersion }}
7070
-
7171
name: Docker Publish
7272
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
7373
uses: ./.github/actions/docker-publish
7474
with:
7575
arch: ${{ inputs.arch }}
76-
distro: ${{ matrix.distro }}
77-
targetFramework: ${{ matrix.targetFramework }}
76+
dockerDistro: ${{ matrix.dockerDistro }}
77+
dotnetVersion: ${{ matrix.dotnetVersion }}
7878
docker_registry_username: ${{ secrets.DOCKER_USERNAME }}
7979
docker_registry_password: ${{ secrets.DOCKER_PASSWORD }}
8080
github_registry_username: ${{ github.repository_owner }}

‎.github/workflows/_docker_manifests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@ env:
77

88
jobs:
99
manifest:
10-
name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
10+
name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
1111
runs-on: ubuntu-latest
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
distro:
15+
dockerDistro:
1616
- alpine.3.20
1717
- centos.stream.9
1818
- debian.12
1919
- fedora.40
2020
- ubuntu.20.04
2121
- ubuntu.22.04
2222
- ubuntu.24.04
23-
targetFramework: [ '8.0', '6.0' ]
23+
dotnetVersion: [ '8.0', '6.0' ]
2424

2525
steps:
2626
-
@@ -51,8 +51,8 @@ jobs:
5151
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
5252
uses: ./.github/actions/docker-manifests
5353
with:
54-
distro: ${{ matrix.distro }}
55-
targetFramework: ${{ matrix.targetFramework }}
54+
dockerDistro: ${{ matrix.dockerDistro }}
55+
dotnetVersion: ${{ matrix.dotnetVersion }}
5656
docker_registry_username: ${{ secrets.DOCKER_USERNAME }}
5757
docker_registry_password: ${{ secrets.DOCKER_PASSWORD }}
5858
github_registry_username: ${{ github.repository_owner }}

‎.github/workflows/_unit_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ env:
77

88
jobs:
99
unit_test:
10-
name: ${{ matrix.os }} - net${{ matrix.targetFramework }}
10+
name: ${{ matrix.os }} - net${{ matrix.dotnetVersion }}
1111
env:
1212
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
1313
strategy:
1414
fail-fast: false
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-15]
17-
targetFramework: [ '8.0', '6.0' ]
17+
dotnetVersion: [ '8.0', '6.0' ]
1818

1919
runs-on: ${{ matrix.os }}
2020
steps:
@@ -29,11 +29,11 @@ jobs:
2929
-
3030
name: '[Unit Test]'
3131
shell: pwsh
32-
run: dotnet run/build.dll --target=Test --dotnet_target=${{ matrix.targetFramework }}
32+
run: dotnet run/build.dll --target=Test --dotnet_version=${{ matrix.dotnetVersion }}
3333

3434
-
3535
name: Test Summary
3636
uses: test-summary/[email protected]
37-
if: matrix.targetFramework == '8.0'
37+
if: matrix.dotnetVersion == '8.0'
3838
with:
3939
paths: artifacts/test-results/*.results.xml

‎build/.run/Artifacts DotnetTool 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="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Artifacts MsBuildCore 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="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Artifacts Native 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="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

0 commit comments

Comments
 (0)