cirrus.yml: Improve the windows_msys2_task

[PATCH] cirrus.yml: Improve the windows_msys2_task

Thomas Huth posted 1 patch 1 year, 2 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230208103046.618154-1-thuth@redhat.com

Maintainers: Yonggang Luo <luoyonggang@gmail.com>

.cirrus.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Expand all Fold all

[PATCH] cirrus.yml: Improve the windows_msys2_task

Posted by Thomas Huth 1 year, 2 months ago

There's no need to run a full-blown bash just to create a directory.
And we can skip the "cd build" each time by doing it once at the
beginning.

Additionally, let's exclude some targets (that we already compile-test
with MinGW in the gitlab jobs) from the build, since the build time of
this task is very long already (between 80 and 90 minutes).

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .cirrus.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4895987da4..5fb00da73d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -100,9 +100,11 @@ windows_msys2_task:
       tar xf C:\tools\archive\msys64.tar
       Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))"
   script:
-    - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build"
-    - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3"
-    - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8"
+    - mkdir build
+    - cd build
+    - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3
+        --target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu"
+    - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8"
     - exit $LastExitCode
   test_script:
     - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check"
-- 
2.31.1

Re: [PATCH] cirrus.yml: Improve the windows_msys2_task

Posted by Alex Bennée 1 year, 2 months ago

Thomas Huth <thuth@redhat.com> writes:

> There's no need to run a full-blown bash just to create a directory.
> And we can skip the "cd build" each time by doing it once at the
> beginning.
>
> Additionally, let's exclude some targets (that we already compile-test
> with MinGW in the gitlab jobs) from the build, since the build time of
> this task is very long already (between 80 and 90 minutes).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Queued to testing/next, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro