From eefca2c3513110691309febb99eab6b80f6219d9 Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Wed, 31 Jan 2024 11:31:00 -0700 Subject: [PATCH 1/2] Don't push images on pull request. --- .github/workflows/docker-publish-windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-publish-windows.yml b/.github/workflows/docker-publish-windows.yml index e23d33c..64bacbb 100644 --- a/.github/workflows/docker-publish-windows.yml +++ b/.github/workflows/docker-publish-windows.yml @@ -53,6 +53,7 @@ jobs: working-directory: windows - name: Push Docker image + if: ${{ github.event_name != 'pull_request' }} run: | docker push ${{ env.REGISTRY }}/${{ steps.image_name.outputs.lowercase }}:${{ matrix.tag }} working-directory: windows @@ -63,6 +64,7 @@ jobs: working-directory: windows - name: Push Xamarin Docker image + if: ${{ github.event_name != 'pull_request' }} run: | docker push ${{ env.REGISTRY }}/${{ steps.image_name.outputs.lowercase }}:${{ matrix.tag }}-xamarin working-directory: windows From e848321aca6c16d76446c3f0610002dfe096344b Mon Sep 17 00:00:00 2001 From: Dave Dunkin Date: Wed, 31 Jan 2024 11:32:18 -0700 Subject: [PATCH 2/2] Install .NET SDKs in C:\Program Files\dotnet. --- windows/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows/Dockerfile b/windows/Dockerfile index 27b0e8e..e9030c6 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -33,9 +33,9 @@ RUN ` # Install supported .NET SDKs RUN ` curl -fSLO https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 ` - && powershell .\dotnet-install.ps1 -Channel 6.0 ` - && powershell .\dotnet-install.ps1 -Channel 7.0 ` - && powershell .\dotnet-install.ps1 -Channel 8.0 ` + && powershell .\dotnet-install.ps1 -Channel 6.0 -InstallDir "\"C:\Program Files\dotnet\\"" ` + && powershell .\dotnet-install.ps1 -Channel 7.0 -InstallDir "\"C:\Program Files\dotnet\\"" ` + && powershell .\dotnet-install.ps1 -Channel 8.0 -InstallDir "\"C:\Program Files\dotnet\\"" ` && del dotnet-install.ps1 WORKDIR /actions-runner