From c4f7c0f8456c6d10685cfe0a5845c71119a6da7b Mon Sep 17 00:00:00 2001 From: Sun Serega Date: Sat, 24 Jun 2023 18:46:58 +0300 Subject: [PATCH] +22 --- .github/workflows/on commit.yaml | 16 +++++++--------- Utils/AOtp.pas | 2 -- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/on commit.yaml b/.github/workflows/on commit.yaml index 481e32b5..fe6f4b7e 100644 --- a/.github/workflows/on commit.yaml +++ b/.github/workflows/on commit.yaml @@ -47,9 +47,11 @@ jobs: Write-Host "Compile: " -NoNewline Start-Process -FilePath 'D:\PABCNETC\pabcnetcclear.exe' -ArgumentList '"PackAll.pas"' -Wait -NoNewWindow - Start-Process -FilePath 'PackAll.exe' -ArgumentList '"Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=D:\PABCNETC\pabcnetcclear.exe" SkipFinishedPause' -Wait -NoNewWindow - if ($?) { - Exit $? + $process = Start-Process -FilePath 'PackAll.exe' -ArgumentList '"Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=D:\PABCNETC\pabcnetcclear.exe" SkipFinishedPause' -NoNewWindow -PassThru -Wait + $exitCode = $process.ExitCode + if ($exitCode -ne 0) { + Write-Host "Exit code is not 0: $exitCode" + exit $exitCode } - name: Check for changes @@ -83,11 +85,6 @@ jobs: with: submodules: 'recursive' - - name: Skip ubuntu - run: echo "need workaround for mono anon pipes" - continue-on-error: true - if: ${{ false }} - - name: apt-gen update run: sudo apt-get update @@ -124,7 +121,8 @@ jobs: run: | "../PABCNETC/pabcnetcclear.exe" "PackAll.pas" - "PackAll.exe" "Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=../PABCNETC/pabcnetcclear.exe" SkipFinishedPause + # TODO need mono anon pipes workaround +# "PackAll.exe" "Stages= FirstPack + Reference + Dummy + OpenCL+OpenCLABC + OpenGL+OpenGLABC + Compile + Test + Release" "PasCompPath=../PABCNETC/pabcnetcclear.exe" SkipFinishedPause - name: Check for changes run: | diff --git a/Utils/AOtp.pas b/Utils/AOtp.pas index 45fc55f3..9f62a99e 100644 --- a/Utils/AOtp.pas +++ b/Utils/AOtp.pas @@ -375,8 +375,6 @@ procedure MakeSureToExit; FinishedPause; Halt(1); end); - Console.WriteLine('Halt(0)'); - Halt(0); end; initialization