Upload zip generated in builds/install_images in GitHub actions.

.github/workflows/main.yml

@@ -234,7 +234,6 @@ jobs:
         cd builds\win32
         call run_all.bat
         call run_tests.bat
-        ren %FB_OUTPUT_DIR% output
 
     - name: Build (Windows, Docker)
       if: startsWith(matrix.os, 'windows-') && matrix.docker
@@ -275,19 +274,17 @@ jobs:
         name: firebird-macos
         path: gen/artifacts
 
-    - name: Clean output (Windows)
+    - name: Extract zip (Windows)
       if: startsWith(matrix.os, 'windows-')
       shell: cmd
       run: |
-        del output\*_test.exe /s
-        del output\lib\*.exp /s
-        del output\*.log /s
+        7z x builds\install_images\*.zip -ooutput
 
     - name: Upload zip (Windows)
       if: startsWith(matrix.os, 'windows-') && !matrix.docker
       uses: actions/upload-artifact@main
       with:
-        name: firebird-windows-vs-${{ env.VS_VERSION }}-x64-zip
+        name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-zip
         path: output
 
     - name: Upload zip (Windows, Docker)
@@ -301,7 +298,7 @@ jobs:
       if: startsWith(matrix.os, 'windows-') && !matrix.docker
       uses: actions/upload-artifact@main
       with:
-        name: firebird-windows-vs-${{ env.VS_VERSION }}-x64-installer
+        name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-installer
         path: builds/install_images/*.exe
 
     - name: Upload installer (Windows, Docker)

builds/docker/windows/run.bat

@@ -1,2 +1,2 @@
 @echo off
-docker run --rm -v %cd%\..\..\..:C:\firebird -v %cd%\..\..\..\output:C:\firebird-out -v %cd%\..\..\..\builds\install_images:C:\firebird\builds\install_images asfernandes/firebird-builder:5 %1
+docker run --rm -v %cd%\..\..\..:C:\firebird asfernandes/firebird-builder:5 %1

builds/docker/windows/scripts/build-x64.bat

@@ -1,4 +1,4 @@
-REM FIXME @echo off
+@echo off
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=amd64
 
@@ -8,9 +8,8 @@ set FB_OUTPUT_SUFFIX=x64
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32
 
-REM call run_all.bat
 call run_all.bat
 
 call run_tests.bat
 
-xcopy /h /e /i /q C:\firebird-build\output_%FB_OUTPUT_SUFFIX%\* C:\firebird-out
+copy C:\firebird-build\builds\install_images\* C:\firebird\builds\install_images

builds/docker/windows/scripts/build-x86.bat

@@ -8,9 +8,8 @@ set FB_OUTPUT_SUFFIX=win32
 xcopy /h /e /i /q C:\firebird C:\firebird-build
 cd /d C:\firebird-build\builds\win32
 
-REM call run_all.bat
 call run_all.bat
 
 call run_tests.bat
 
-xcopy /h /e /i /q C:\firebird-build\output_%FB_OUTPUT_SUFFIX%\* C:\firebird-out
+copy C:\firebird-build\builds\install_images\* C:\firebird\builds\install_images