Update workflows

sungaila · Oct 11, 2024 · 21759f7 · 21759f7
1 parent 6b240d8
commit 21759f7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 103 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -217,34 +217,28 @@ jobs:
             src/Tests/Assets/SocialPreview.pdf
       - name: console (alpine)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile . && docker run --rm -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine.dockerfile . && docker run --rm -t console
       - name: console (alpine-aot)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile . && docker run --rm -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/alpine-aot.dockerfile . && docker run --rm -t console
       - name: console (ubuntu)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile . && docker run --rm -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu.dockerfile . && docker run --rm -t console
       - name: console (ubuntu-chiseled)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile . && docker run --rm  -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled.dockerfile . && docker run --rm  -t console
       - name: console (ubuntu-aot)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile . && docker run --rm  -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-aot.dockerfile . && docker run --rm  -t console
       - name: console (ubuntu-chiseled-aot)
         if: runner.os == 'Linux' && (success() || failure())
-        run: docker build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile . && docker run --rm  -t console
+        run: docker buildx build -t console -f src/FrameworkTests/AotConsole/Dockerfiles/ubuntu-chiseled-aot.dockerfile . && docker run --rm  -t console
       - name: console (windows-servercore)
         if: runner.os == 'Windows' && (success() || failure())
-        run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore.dockerfile" . && docker build -t console -f windows-servercore.dockerfile . && docker run --rm -t console
+        run: docker build -t console -f src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore.dockerfile . && docker run --rm -t console
       - name: console (windows-servercore-aot)
         if: runner.os == 'Windows' && (success() || failure())
-        run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore-aot.dockerfile" . && docker build -t console -f windows-servercore-aot.dockerfile . && docker run --rm -t console
-      - name: console (windows-nanoserver)
-        if: false && runner.os == 'Windows' && (success() || failure())
-        run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-nanoserver.dockerfile" . && docker build -t console -f windows-nanoserver.dockerfile . && docker run --rm -t console
-      - name: console (windows-nanoserver-aot)
-        if: false && runner.os == 'Windows' && (success() || failure())
-        run: xcopy /y "src\FrameworkTests\AotConsole\Dockerfiles\windows-nanoserver-aot.dockerfile" . && docker build -t console -f windows-nanoserver-aot.dockerfile . && docker run --rm -t console
+        run: docker build -t console -f src\FrameworkTests\AotConsole\Dockerfiles\windows-servercore-aot.dockerfile . && docker run --rm -t console
   publish-test-results:
     name: Publish tests results
     needs: [test, docker]

diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver-aot.dockerfile
diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-nanoserver.dockerfile
diff --git a/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile b/src/FrameworkTests/AotConsole/Dockerfiles/windows-servercore-aot.dockerfile
@@ -15,28 +15,27 @@ ARG BUILD_CONFIGURATION=Release
 RUN dotnet build "./FrameworkTests/AotConsole/AotConsole.csproj" -c %BUILD_CONFIGURATION% -o /app/build --no-restore
 
 FROM build AS vsbuildtools
-SHELL ["cmd", "/S", "/C"]
+SHELL ["powershell", "-NoLogo", "-NonInteractive", "-Command"]
 
-RUN powershell -c "Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe"
-RUN (start /w vs_buildtools.exe --wait --norestart --nocache \
-        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" \
-        --add Microsoft.VisualStudio.Component.Roslyn.Compiler \
-        --add Microsoft.Component.MSBuild \
-        --add Microsoft.VisualStudio.Component.CoreBuildTools \
-        --add Microsoft.VisualStudio.Workload.MSBuildTools \
-        --add Microsoft.VisualStudio.Component.Windows10SDK \
-        --add Microsoft.VisualStudio.Component.VC.CoreBuildTools \
-        --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
-        --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest \
-        --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
-        --add Microsoft.VisualStudio.Component.TextTemplating \
-        --add Microsoft.VisualStudio.Component.VC.CoreIde \
-        --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
-        --add Microsoft.VisualStudio.Workload.VCTools \
-        --add Microsoft.Component.MSBuild \
-        --add Microsoft.VisualStudio.Workload.VCTools \
-        || IF "%ERRORLEVEL%"=="3010" EXIT 0) \
-    && del /q vs_buildtools.exe
+RUN Invoke-WebRequest -Uri https://aka.ms/vs/17/release/vs_buildtools.exe -OutFile vs_buildtools.exe
+RUN .\vs_buildtools.exe --quiet --wait --norestart --nocache \
+    --installPath \"%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools\" \
+    --add Microsoft.VisualStudio.Component.Roslyn.Compiler \
+    --add Microsoft.Component.MSBuild \
+    --add Microsoft.VisualStudio.Component.CoreBuildTools \
+    --add Microsoft.VisualStudio.Workload.MSBuildTools \
+    --add Microsoft.VisualStudio.Component.Windows10SDK \
+    --add Microsoft.VisualStudio.Component.VC.CoreBuildTools \
+    --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 \
+    --add Microsoft.VisualStudio.Component.VC.Redist.14.Latest \
+    --add Microsoft.VisualStudio.Component.Windows11SDK.22621 \
+    --add Microsoft.VisualStudio.Component.TextTemplating \
+    --add Microsoft.VisualStudio.Component.VC.CoreIde \
+    --add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core \
+    --add Microsoft.VisualStudio.Workload.VCTools \
+    --add Microsoft.Component.MSBuild \
+    --add Microsoft.VisualStudio.Workload.VCTools
+RUN Remove-Item vs_buildtools.exe
 
 FROM vsbuildtools AS publish
 ARG BUILD_CONFIGURATION=Release