Skip to content

Commit

Permalink
gitlab-ci: terminate all msys2 related processes before Windows/Aarch…
Browse files Browse the repository at this point in the history
…64 jobs.

This is the command suggest by MSYS2 developers here:
msys2/MSYS2-packages#4340 (comment)

They also say to run it outside the MSYS2 environment, which is why it's in the
CI rules, not in the shell script.
  • Loading branch information
Jehan committed Feb 8, 2024
1 parent 51b6228 commit 150028b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@ deps-win-a64:
- if ($stuck -eq "True") {
Remove-Item -Force -Path "C:\msys64\var\lib\pacman\db.lck";
Write-Output "Cleaned previous stuck pacman" }
- Start-Job -ScriptBlock{sleep 90; taskkill /t /F /IM "pacman.exe"}
- taskkill /F /FI "MODULES eq msys-2.0.dll"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/1_build-deps-msys2.sh"
retry: 2
artifacts:
Expand Down Expand Up @@ -725,7 +725,7 @@ gimp-win-a64:
# Temporary patch until we use the latest LLVM.
- git apply ./build/windows/patches/0001-clang-rc-files-fix.patch
- git apply ./build/windows/patches/0004-clang-windres.patch
- Start-Job -ScriptBlock{sleep 90; taskkill /t /F /IM "pacman.exe"}
- taskkill /F /FI "MODULES eq msys-2.0.dll"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/2_build-gimp-msys2.sh"
retry: 2
artifacts:
Expand Down Expand Up @@ -762,7 +762,7 @@ packaging-win-a64:
- if ($stuck -eq "True") {
Remove-Item -Force -Path "C:\msys64\var\lib\pacman\db.lck";
Write-Output "Cleaned previous stuck pacman" }
- Start-Job -ScriptBlock{sleep 90; taskkill /t /F /IM "pacman.exe"}
- taskkill /F /FI "MODULES eq msys-2.0.dll"
- C:\msys64\usr\bin\bash -lc "bash -x ./build/windows/gitlab-ci/3_package-gimp-uni_base.sh"
- cd gimp-a64
- C:\msys64\usr\bin\bash -lc "bash -x ../build/windows/gitlab-ci/3_package-gimp-uni_sym.sh"
Expand Down

0 comments on commit 150028b

Please sign in to comment.