From 47812ea93390fb44c135a04491c0281aa54cf877 Mon Sep 17 00:00:00 2001 From: TheTank20 <57580668+thepwrtank18@users.noreply.github.com> Date: Wed, 23 Jul 2025 10:55:36 -0500 Subject: [PATCH] Update dos-djgpp.yml --- .github/workflows/dos-djgpp.yml | 138 ++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/.github/workflows/dos-djgpp.yml b/.github/workflows/dos-djgpp.yml index ee968c3..77cf4e9 100644 --- a/.github/workflows/dos-djgpp.yml +++ b/.github/workflows/dos-djgpp.yml @@ -188,3 +188,141 @@ jobs: with: name: UMSKT-DOS-x86 path: build/actions_upload + compress: + needs: build + if: success() + runs-on: ubuntu-latest + strategy: + fail-fast: false + steps: + - name: Setup TDM-GCC + run: | + Write-Host Downloading TDM-GCC v10.3.0... + Invoke-WebRequest -Uri 'https://github.com/jmeubank/tdm-gcc/releases/download/v10.3.0-tdm64-2/tdm64-gcc-10.3.0-2.exe' -OutFile 'C:\Windows\temp\TDM-GCC-64.exe' + Write-Host Creating directory... + New-Item -ItemType Directory -Path 'C:\TDM-GCC-64' + Write-Host Copying files [Set 1/3]... + Start-Process '7z' -ArgumentList 'e C:\Windows\temp\TDM-GCC-64.exe -oC:\TDM-GCC-64 -y' -Wait + Write-Host Copying files [Set 2/3]... + Start-Process '7z' -ArgumentList 'e C:\TDM-GCC-64\*.tar.xz -oC:\TDM-GCC-64 -y' -Wait + Write-Host Copying files [Set 3/3]... + Start-Process '7z' -ArgumentList 'x C:\TDM-GCC-64\*.tar -oC:\TDM-GCC-64 -y' -Wait + Write-Host Adding environment variables... + $env:PATH = 'C:\TDM-GCC-64\bin;' + $env:PATH + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) + + - name: Setup UPX + run: | + Invoke-WebRequest -Uri 'https://github.com/upx/upx/releases/download/v5.0.2/upx-5.0.2-win64.zip' -OutFile 'C:\Windows\temp\upx.zip' + Write-Host Creating directory... + New-Item -ItemType Directory -Path 'C:\UPX' + Write-Host Copying files... + Expand-Archive -Path 'C:\Windows\temp\upx.zip' -DestinationPath 'C:\UPX' + Write-Host Adding environment variables... + $env:PATH = 'C:\UPX\upx-5.0.2-win64;' + $env:PATH + [Environment]::SetEnvironmentVariable('PATH', $env:PATH, [EnvironmentVariableTarget]::Machine) + + - name: Download artifact + uses: actions/download-artifact@v4 + with: + name: UMSKT-DOS-x86 + path: .\uncomp\ + - name: Install UPX + uses: crazy-max/ghaction-upx@v3 + with: + install-only: true + + - name: Compress binary + shell: pwsh + run: | + upx .\uncomp\umskt.exe --best --ultra-brute -v + + - name: Setup DOSBox test environment + run: | + mkdir -p dosbox_test + cp uncomp/umskt.exe dosbox_test/ + # Download DPMI server directly + # wget https://github.com/UMSKT/winactiontest/raw/refs/heads/main/CWSDPMI.EXE -O dosbox_test/CWSDPMI.EXE + # Create test batch file + cat > dosbox_test/test.bat << EOL + @echo off + echo Running test 1... + umskt.exe -b 2C -c 365 -s 069420 > TEST1.TXT + if errorlevel 1 goto error + echo Running test 2... + umskt.exe -i 253286028742154311079061239762245184619981623171292574 > TEST2.TXT + if errorlevel 1 goto error + echo Tests completed > DONE.TXT + goto end + :error + echo Test failed > ERROR.TXT + :end + exit + EOL + # Create DOSBox configuration + cat > dosbox_test/dosbox.conf << EOL + [sdl] + nosound=true + [cpu] + cputype=386 + core=dynamic + cycles=max + [autoexec] + mount c . + c: + test.bat + exit + EOL + + - name: Run tests in DOSBox + run: | + cd dosbox_test + timeout 30s dosbox -conf dosbox.conf -nogui -exit + # Check if the test completed successfully + if [ ! -f DONE.TXT ]; then + echo "Tests did not complete successfully" + if [ -f ERROR.TXT ]; then + echo "Test execution failed" + fi + if [ -f TEST1.TXT ]; then + echo "Test 1 output:" + cat TEST1.TXT + fi + if [ -f TEST2.TXT ]; then + echo "Test 2 output:" + cat TEST2.TXT + fi + exit 1 + fi + # Verify test outputs + if [ ! -f TEST1.TXT ] || [ ! -f TEST2.TXT ]; then + echo "Test output files missing" + exit 1 + fi + # Check test results - looking for key format patterns + if ! grep -qE '[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}' TEST1.TXT || \ + ! grep -qE '[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}-[0-9]{6}' TEST2.TXT; then + echo "Tests failed - unexpected output format" + echo "Test 1 output:" + cat TEST1.TXT + echo "Test 2 output:" + cat TEST2.TXT + exit 1 + else + echo "All tests passed successfully" + echo "Test 1 output:" + cat TEST1.TXT + echo "Test 2 output:" + cat TEST2.TXT + fi + + - name: Move executable to upload directory + run: | + mkdir build/actions_upload + mv build/umskt.exe build/actions_upload/ + + - name: Upload build artifact + uses: actions/upload-artifact@v4.6.2 + with: + name: UMSKT-DOS-x86-Compressed + path: build/actions_upload