Skip to content

Commit bd89814

Browse files
arturcicarturcic
committed
update workflow files
1 parent f39d213 commit bd89814

File tree

9 files changed

+33
-13
lines changed

9 files changed

+33
-13
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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
38+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub --verbosity=diagnostic
3939
-
4040
name: Login to GitHub
4141
uses: docker/login-action@v2
@@ -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
49+
run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github --verbosity=diagnostic

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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
20+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --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
24+
run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github --verbosity=diagnostic

‎.github/workflows/_docker.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,21 @@ jobs:
3737
with:
3838
name: nuget
3939
path: ${{ github.workspace }}/artifacts/packages/nuget
40+
-
41+
name: Set up Docker
42+
uses: crazy-max/ghaction-setup-docker@v3
43+
with:
44+
daemon-config: '{ "features": { "containerd-snapshotter": true } }'
4045
-
4146
name: Setup QEMU
42-
if: inputs.arch == 'arm64'
4347
uses: docker/setup-qemu-action@v3
4448
-
4549
name: Setup Docker Buildx
46-
if: inputs.arch == 'arm64'
4750
uses: docker/setup-buildx-action@v3
4851
with:
49-
install: true
52+
version: 'latest'
53+
driver-opts: 'image=moby/buildkit:buildx-stable-1'
54+
install: true
5055
-
5156
name: Docker Test
5257
if: success() && github.event_name == 'pull_request' || github.repository_owner != 'GitTools'

‎.github/workflows/_docker_manifests.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,21 @@ jobs:
2424
-
2525
name: Restore State
2626
uses: ./.github/actions/artifacts-restore
27+
-
28+
name: Set up Docker
29+
uses: crazy-max/ghaction-setup-docker@v3
30+
with:
31+
daemon-config: '{ "features": { "containerd-snapshotter": true } }'
32+
-
33+
name: Setup QEMU
34+
uses: docker/setup-qemu-action@v3
35+
-
36+
name: Setup Docker Buildx
37+
uses: docker/setup-buildx-action@v3
38+
with:
39+
version: 'latest'
40+
driver-opts: 'image=moby/buildkit:buildx-stable-1'
41+
install: true
2742
-
2843
name: Docker Manifests
2944
if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'

‎build/.run/Docker Build.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="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11 --verbosity=diagnostic" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Manifest.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="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker Publish.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="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.11 --verbosity=diagnostic" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/.run/Docker 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="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
33
<option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
4-
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=6.0 --docker_distro=debian.11" />
4+
<option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=debian.11" />
55
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
66
<option name="PASS_PARENT_ENVS" value="1" />
77
<envs>

‎build/common/Utilities/DockerContextExtensions.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public static void DockerBuildImage(this BuildContextBase context, DockerImage d
4949

5050
var suffix = arch.ToSuffix();
5151
var imageSuffix = $"({distro}-{context.Version.NugetVersion}-{targetFramework}-{arch.ToSuffix()})";
52-
var description = $"org.opencontainers.image.description=GitVersion images {imageSuffix})";
52+
var description = $"org.opencontainers.image.description=GitVersion images {imageSuffix}";
5353

5454
var buildSettings = new DockerBuildXBuildSettings
5555
{
@@ -130,7 +130,7 @@ public static void DockerPushImage(this BuildContextBase context, DockerImage do
130130
public static DockerBuildXImageToolsCreateSettings GetManifestSettings(DockerImage dockerImage, string version, string tag)
131131
{
132132
var imageSuffix = $"({dockerImage.Distro}-{version}-{dockerImage.TargetFramework})";
133-
var description = $"org.opencontainers.image.description=GitVersion images {imageSuffix})";
133+
var description = $"org.opencontainers.image.description=GitVersion images {imageSuffix}";
134134
var settings = new DockerBuildXImageToolsCreateSettings
135135
{
136136
Tag = [tag],

0 commit comments

Comments
 (0)