File tree Expand file tree Collapse file tree 10 files changed +62
-62
lines changed Expand file tree Collapse file tree 10 files changed +62
-62
lines changed Original file line number Diff line number Diff line change 11name : ' Docker Manifests'
22description : ' Docker Publish Manifests'
33inputs :
4- dockerDistro :
4+ docker_distro :
55 description : ' Linux Distro'
66 required : true
7- dotnetVersion :
7+ dotnet_version :
88 description : ' .net version'
99 required : true
1010 docker_registry_username :
3434 shell : pwsh
3535 run : |
3636 dotnet run/docker.dll `
37- --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} `
38- --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub
37+ --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnet_version }} `
38+ --docker_distro=${{ inputs.docker_distro }} --docker_registry dockerhub
3939 -
4040 name : Login to GitHub
4141 uses : docker/login-action@v3
4848 shell : pwsh
4949 run : |
5050 dotnet run/docker.dll `
51- --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} `
52- --docker_distro=${{ inputs.dockerDistro }} --docker_registry github
51+ --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnet_version }} `
52+ --docker_distro=${{ inputs.docker_distro }} --docker_registry github
Original file line number Diff line number Diff line change @@ -4,10 +4,10 @@ inputs:
44 arch :
55 description : ' Docker architecture'
66 required : true
7- dockerDistro :
7+ docker_distro :
88 description : ' Linux Distro'
99 required : true
10- dotnetVersion :
10+ dotnet_version :
1111 description : ' .net version'
1212 required : true
1313 docker_registry_username :
3737 shell : pwsh
3838 run : |
3939 dotnet run/docker.dll `
40- --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} `
41- --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
40+ --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnet_version }} `
41+ --docker_distro=${{ inputs.docker_distro }} --docker_registry dockerhub --verbosity=diagnostic
4242 -
4343 name : Login to GitHub
4444 uses : docker/login-action@v3
5151 shell : pwsh
5252 run : |
5353 dotnet run/docker.dll `
54- --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} `
55- --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic
54+ --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnet_version }} `
55+ --docker_distro=${{ inputs.docker_distro }} --docker_registry github --verbosity=diagnostic
Original file line number Diff line number Diff line change @@ -4,10 +4,10 @@ inputs:
44 arch :
55 description : ' Docker architecture'
66 default : ' amd64'
7- dockerDistro :
7+ docker_distro :
88 description : ' Linux Distro'
99 default : ' debian.12'
10- dotnetVersion :
10+ dotnet_version :
1111 description : ' .net version'
1212 default : ' 8.0'
1313
@@ -19,12 +19,12 @@ runs:
1919 shell : pwsh
2020 run : |
2121 dotnet run/docker.dll --target=DockerTest `
22- --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} `
23- --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
22+ --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnet_version }} `
23+ --docker_distro=${{ inputs.docker_distro }} --docker_registry dockerhub --verbosity=diagnostic
2424 -
2525 name : ' [Docker Build & Test] GitHub'
2626 shell : pwsh
2727 run : |
2828 dotnet run/docker.dll --target=DockerTest `
29- --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} `
30- --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic
29+ --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnet_version }} `
30+ --docker_distro=${{ inputs.docker_distro }} --docker_registry github --verbosity=diagnostic
Original file line number Diff line number Diff line change 77 arch :
88 required : true
99 type : string
10- dockerDistros :
10+ docker_distros :
1111 required : true
1212 type : string
13- dotnetVersions :
13+ dotnet_versions :
1414 required : true
1515 type : string
1616env :
1919
2020jobs :
2121 artifacts :
22- name : ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
22+ name : ${{ matrix.docker_distro }} - net${{ matrix.dotnet_version }}
2323 runs-on : ${{ inputs.runner }}
2424 strategy :
2525 fail-fast : false
26- matrix :
27- dockerDistro : ${{ fromJson(inputs.dockerDistros ) }}
28- dotnetVersion : ${{ fromJson(inputs.dotnetVersions ) }}
26+ matrix :
27+ docker_distro : ${{ fromJson(inputs.docker_distros ) }}
28+ dotnet_version : ${{ fromJson(inputs.dotnet_versions ) }}
2929 steps :
3030 -
3131 name : Checkout
5555 shell : pwsh
5656 run : |
5757 dotnet run/artifacts.dll `
58- --target=ArtifactsTest --arch=${{ inputs.arch }} --dotnet_version=${{ matrix.dotnetVersion }} `
59- --docker_distro=${{ matrix.dockerDistro }}
58+ --target=ArtifactsTest --arch=${{ inputs.arch }} --dotnet_version=${{ matrix.dotnet_version }} `
59+ --docker_distro=${{ matrix.docker_distro }}
Original file line number Diff line number Diff line change 77 arch :
88 required : true
99 type : string
10- dockerDistros :
10+ docker_distros :
1111 required : true
1212 type : string
13- dotnetVersions :
13+ dotnet_versions :
1414 required : true
1515 type : string
1616env :
1919
2020jobs :
2121 docker :
22- name : ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
22+ name : ${{ matrix.docker_distro }} - net${{ matrix.dotnet_version }}
2323 runs-on : ${{ inputs.runner }}
2424 strategy :
2525 fail-fast : false
2626 matrix :
27- dockerDistro : ${{ fromJson(inputs.dockerDistros ) }}
28- dotnetVersion : ${{ fromJson(inputs.dotnetVersions ) }}
27+ docker_distro : ${{ fromJson(inputs.docker_distros ) }}
28+ dotnet_version : ${{ fromJson(inputs.dotnet_versions ) }}
2929 steps :
3030 -
3131 name : Checkout
@@ -50,16 +50,16 @@ jobs:
5050 uses : ./.github/actions/docker-test
5151 with :
5252 arch : ${{ inputs.arch }}
53- dockerDistro : ${{ matrix.dockerDistro }}
54- dotnetVersion : ${{ matrix.dotnetVersion }}
53+ docker_distro : ${{ matrix.docker_distro }}
54+ dotnet_version : ${{ matrix.dotnet_version }}
5555 -
5656 name : Docker Publish
5757 if : success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
5858 uses : ./.github/actions/docker-publish
5959 with :
6060 arch : ${{ inputs.arch }}
61- dockerDistro : ${{ matrix.dockerDistro }}
62- dotnetVersion : ${{ matrix.dotnetVersion }}
61+ docker_distro : ${{ matrix.docker_distro }}
62+ dotnet_version : ${{ matrix.dotnet_version }}
6363 docker_registry_username : ${{ secrets.DOCKER_USERNAME }}
6464 docker_registry_password : ${{ secrets.DOCKER_PASSWORD }}
6565 github_registry_username : ${{ github.repository_owner }}
Original file line number Diff line number Diff line change 11on :
22 workflow_call :
33 inputs :
4- dockerDistros :
4+ docker_distros :
55 required : true
66 type : string
7- dotnetVersions :
7+ dotnet_versions :
88 required : true
99 type : string
1010env :
1313
1414jobs :
1515 manifest :
16- name : ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
16+ name : ${{ matrix.docker_distro }} - net${{ matrix.dotnet_version }}
1717 runs-on : ubuntu-24.04
1818 strategy :
1919 fail-fast : false
2020 matrix :
21- dockerDistro : ${{ fromJson(inputs.dockerDistros ) }}
22- dotnetVersion : ${{ fromJson(inputs.dotnetVersions ) }}
21+ docker_distro : ${{ fromJson(inputs.docker_distros ) }}
22+ dotnet_version : ${{ fromJson(inputs.dotnet_versions ) }}
2323 steps :
2424 -
2525 name : Checkout
3737 if : success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
3838 uses : ./.github/actions/docker-manifests
3939 with :
40- dockerDistro : ${{ matrix.dockerDistro }}
41- dotnetVersion : ${{ matrix.dotnetVersion }}
40+ docker_distro : ${{ matrix.docker_distro }}
41+ dotnet_version : ${{ matrix.dotnet_version }}
4242 docker_registry_username : ${{ secrets.DOCKER_USERNAME }}
4343 docker_registry_password : ${{ secrets.DOCKER_PASSWORD }}
4444 github_registry_username : ${{ github.repository_owner }}
Original file line number Diff line number Diff line change 11on :
22 workflow_call :
33 outputs :
4- dockerDistros :
4+ docker_distros :
55 description : ' List of Docker distros'
6- value : ${{ jobs.set_matrix.outputs.dockerDistros }}
7- dotnetVersions :
6+ value : ${{ jobs.set_matrix.outputs.docker_distros }}
7+ dotnet_versions :
88 description : ' List of .NET versions'
9- value : ${{ jobs.set_matrix.outputs.dotnetVersions }}
9+ value : ${{ jobs.set_matrix.outputs.dotnet_versions }}
1010jobs :
1111 prepare :
1212 name : ${{ matrix.os }}
5151 name : Set Matrix
5252 runs-on : ubuntu-24.04
5353 outputs :
54- dockerDistros : ${{ steps.set_matrix.outputs.dockerDistros }}
55- dotnetVersions : ${{ steps.set_matrix.outputs.dotnetVersions }}
54+ docker_distros : ${{ steps.set_matrix.outputs.docker_distros }}
55+ dotnet_versions : ${{ steps.set_matrix.outputs.dotnet_versions }}
5656 steps :
5757 -
5858 name : Checkout
Original file line number Diff line number Diff line change 11on :
22 workflow_call :
33 inputs :
4- dotnetVersions :
4+ dotnet_versions :
55 required : true
66 type : string
77env :
1010
1111jobs :
1212 unit_test :
13- name : ${{ matrix.os }} - net${{ matrix.dotnetVersion }}
13+ name : ${{ matrix.os }} - net${{ matrix.dotnet_version }}
1414 env :
1515 CODECOV_TOKEN : ${{ secrets.CODECOV_TOKEN }}
1616 strategy :
1717 fail-fast : false
1818 matrix :
1919 os : [windows-2025, ubuntu-24.04, macos-15]
20- dotnetVersion : ${{ fromJson(inputs.dotnetVersions ) }}
20+ dotnet_version : ${{ fromJson(inputs.dotnet_versions ) }}
2121
2222 runs-on : ${{ matrix.os }}
2323 steps :
@@ -32,11 +32,11 @@ jobs:
3232 -
3333 name : ' [Unit Test]'
3434 shell : pwsh
35- run : dotnet run/build.dll --target=Test --dotnet_version=${{ matrix.dotnetVersion }}
35+ run : dotnet run/build.dll --target=Test --dotnet_version=${{ matrix.dotnet_version }}
3636
3737 -
3838 name : Test Summary
3939 uses :
test-summary/[email protected] 40- if : matrix.dotnetVersion == '9.0'
40+ if : matrix.dotnet_version == '9.0'
4141 with :
4242 paths : artifacts/test-results/*.results.xml
Original file line number Diff line number Diff line change 5454 needs : [ prepare ]
5555 uses : ./.github/workflows/_unit_tests.yml
5656 with :
57- dotnetVersions : ${{ needs.prepare.outputs.dotnetVersions }}
57+ dotnet_versions : ${{ needs.prepare.outputs.dotnet_versions }}
5858 secrets : inherit
5959
6060 artifacts_windows_test :
7777 with :
7878 runner : ${{ matrix.runner }}
7979 arch : ${{ matrix.arch }}
80- dockerDistros : ${{ needs.prepare.outputs.dockerDistros }}
81- dotnetVersions : ${{ needs.prepare.outputs.dotnetVersions }}
80+ docker_distros : ${{ needs.prepare.outputs.docker_distros }}
81+ dotnet_versions : ${{ needs.prepare.outputs.dotnet_versions }}
8282
8383 docker_linux_images :
8484 needs : [ prepare, build ]
@@ -96,17 +96,17 @@ jobs:
9696 with :
9797 runner : ${{ matrix.runner }}
9898 arch : ${{ matrix.arch }}
99- dockerDistros : ${{ needs.prepare.outputs.dockerDistros }}
100- dotnetVersions : ${{ needs.prepare.outputs.dotnetVersions }}
99+ docker_distros : ${{ needs.prepare.outputs.docker_distros }}
100+ dotnet_versions : ${{ needs.prepare.outputs.dotnet_versions }}
101101 secrets : inherit
102102
103103 docker_linux_manifests :
104104 needs : [ prepare, docker_linux_images ]
105105 name : Docker Manifests
106106 uses : ./.github/workflows/_docker_manifests.yml
107107 with :
108- dockerDistros : ${{ needs.prepare.outputs.dockerDistros }}
109- dotnetVersions : ${{ needs.prepare.outputs.dotnetVersions }}
108+ docker_distros : ${{ needs.prepare.outputs.docker_distros }}
109+ dotnet_versions : ${{ needs.prepare.outputs.dotnet_versions }}
110110 secrets : inherit
111111
112112 publish :
Original file line number Diff line number Diff line change @@ -8,8 +8,8 @@ public override void Run(BuildContext context)
88 {
99 if ( context . BuildSystem ( ) . IsRunningOnGitHubActions )
1010 {
11- context . GitHubActions ( ) . Commands . SetOutputParameter ( "dockerDistros " , context . SerializeJson ( Constants . DockerDistros ) ) ;
12- context . GitHubActions ( ) . Commands . SetOutputParameter ( "dotnetVersions " , context . SerializeJson ( Constants . DotnetVersions ) ) ;
11+ context . GitHubActions ( ) . Commands . SetOutputParameter ( "docker_distros " , context . SerializeJson ( Constants . DockerDistros ) ) ;
12+ context . GitHubActions ( ) . Commands . SetOutputParameter ( "dotnet_versions " , context . SerializeJson ( Constants . DotnetVersions ) ) ;
1313 }
1414 else
1515 {
You can’t perform that action at this time.
0 commit comments