[PATCH v3 0/3] Windows cirrus ci improvements

[PATCH v3 0/3] Windows cirrus ci improvements

[Yonggang Luo]

V2-V3
update the commit log
update MAINTAINERS's properly
fixes old MAINTAINERS's pointed path

V2:
* cirrus/win32: upgrade mingw base packages
* ci: Add empty github workflow for reporting historical cirrus result at github
* misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

Yonggang Luo (3):
  cirrus/win32: upgrade mingw base packages
  ci: Add empty github workflow for reporting historical cirrus result
    at github
  misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

 .cirrus.yml                |  2 +-
 .github/workflows/main.yml | 24 ++++++++++++++++++++++++
 .gitlab-ci.d/windows.yml   |  2 +-
 MAINTAINERS                |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/main.yml

-- 
2.31.1.windows.1

[PATCH v3 1/3] cirrus/win32: upgrade mingw base packages

[Yonggang Luo]

This is used to fixes the cirrus failure at https://github.com/qemu/qemu/runs/5652470682

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 .cirrus.yml              | 2 +-
 .gitlab-ci.d/windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 7552d70974..59b004721d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -12,7 +12,7 @@ windows_msys2_task:
     CIRRUS_SHELL: powershell
     MSYS: winsymlinks:nativestrict
     MSYSTEM: MINGW64
-    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2021-04-19/msys2-base-x86_64-20210419.sfx.exe
+    MSYS2_URL: https://github.com/msys2/msys2-installer/releases/download/2022-03-19/msys2-base-x86_64-20220319.sfx.exe
     MSYS2_FINGERPRINT: 0
     MSYS2_PACKAGES: "
       diffutils git grep make pkg-config sed
diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml
index 1df1630349..e8b65faccc 100644
--- a/.gitlab-ci.d/windows.yml
+++ b/.gitlab-ci.d/windows.yml
@@ -16,7 +16,7 @@
     }
   - If ( !(Test-Path -Path msys64\var\cache\msys2.exe ) ) {
       Invoke-WebRequest
-      "https://github.com/msys2/msys2-installer/releases/download/2021-07-25/msys2-base-x86_64-20210725.sfx.exe"
+      "https://github.com/msys2/msys2-installer/releases/download/2022-03-19/msys2-base-x86_64-20220319.sfx.exe"
       -outfile "msys64\var\cache\msys2.exe"
     }
   - msys64\var\cache\msys2.exe -y
-- 
2.31.1.windows.1

[PATCH v3 2/3] ci: Add empty github workflow for reporting historical cirrus result at github

[Yonggang Luo]

Looks like https://github.com/lygstate/qemu/actions does

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 .github/workflows/main.yml | 24 ++++++++++++++++++++++++
 MAINTAINERS                |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..71f5fbd556
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,24 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  check-patch:
+    name: Check Patch
+    runs-on: ubuntu-latest
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install dependent packages
+        run: echo "Empty action"
diff --git a/MAINTAINERS b/MAINTAINERS
index cc364afef7..01d2ce93bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3639,6 +3639,7 @@ Windows Hosted Continuous Integration
 M: Yonggang Luo <luoyonggang@gmail.com>
 S: Maintained
 F: .cirrus.yml
+F: .github/workflows/main.yml
 W: https://cirrus-ci.com/github/qemu/qemu
 
 Guest Test Compilation Support
-- 
2.31.1.windows.1

Re: [PATCH v3 2/3] ci: Add empty github workflow for reporting historical cirrus result at github

[Daniel P. Berrangé]

On Wed, Mar 23, 2022 at 04:07:54PM +0800, Yonggang Luo wrote:
> Looks like https://github.com/lygstate/qemu/actions does
> 
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>  .github/workflows/main.yml | 24 ++++++++++++++++++++++++
>  MAINTAINERS                |  1 +
>  2 files changed, 25 insertions(+)
>  create mode 100644 .github/workflows/main.yml
> 
> diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> new file mode 100644
> index 0000000000..71f5fbd556
> --- /dev/null
> +++ b/.github/workflows/main.yml
> @@ -0,0 +1,24 @@
> +# This is a basic workflow to help you get started with Actions
> +
> +name: CI
> +
> +# Controls when the action will run. Triggers the workflow on push or pull request
> +# events but only for the master branch
> +on:
> +  push:
> +    branches: [ master ]
> +  pull_request:
> +    branches: [ master ]
> +
> +# A workflow run is made up of one or more jobs that can run sequentially or in parallel
> +jobs:
> +  check-patch:
> +    name: Check Patch
> +    runs-on: ubuntu-latest
> +    steps:
> +      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
> +      - uses: actions/checkout@v2
> +        with:
> +          fetch-depth: 0
> +      - name: Install dependent packages
> +        run: echo "Empty action"

I really rather we just integrated the Cirrus CI windows job into our GitLab
pipeline using cirrus-run, as we did for the other Cirrus jobs.

We've also already got some native msys jobs under GitLab that test some
combinations, but not all since they're somewhat slow. So we still need
to take advantage of Cirrus for some msys testing, but we can likely
reduce the overlap.

I definitely don't want to see us increasing our use of GitHub, as having
multiple places to look at for CI results is a really bad thing. We want
todo what is possible to make GitLab the single dashboard for all CI info.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [PATCH v3 2/3] ci: Add empty github workflow for reporting historical cirrus result at github

[罗勇刚(Yonggang Luo)]

[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]

On Wed, Mar 23, 2022 at 5:33 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:
>
> On Wed, Mar 23, 2022 at 04:07:54PM +0800, Yonggang Luo wrote:
> > Looks like https://github.com/lygstate/qemu/actions does
> >
> > Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> > ---
> >  .github/workflows/main.yml | 24 ++++++++++++++++++++++++
> >  MAINTAINERS                |  1 +
> >  2 files changed, 25 insertions(+)
> >  create mode 100644 .github/workflows/main.yml
> >
> > diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
> > new file mode 100644
> > index 0000000000..71f5fbd556
> > --- /dev/null
> > +++ b/.github/workflows/main.yml
> > @@ -0,0 +1,24 @@
> > +# This is a basic workflow to help you get started with Actions
> > +
> > +name: CI
> > +
> > +# Controls when the action will run. Triggers the workflow on push or
pull request
> > +# events but only for the master branch
> > +on:
> > +  push:
> > +    branches: [ master ]
> > +  pull_request:
> > +    branches: [ master ]
> > +
> > +# A workflow run is made up of one or more jobs that can run
sequentially or in parallel
> > +jobs:
> > +  check-patch:
> > +    name: Check Patch
> > +    runs-on: ubuntu-latest
> > +    steps:
> > +      # Checks-out your repository under $GITHUB_WORKSPACE, so your
job can access it
> > +      - uses: actions/checkout@v2
> > +        with:
> > +          fetch-depth: 0
> > +      - name: Install dependent packages
> > +        run: echo "Empty action"
>
> I really rather we just integrated the Cirrus CI windows job into our
GitLab
> pipeline using cirrus-run, as we did for the other Cirrus jobs.
>
> We've also already got some native msys jobs under GitLab that test some
> combinations, but not all since they're somewhat slow. So we still need
> to take advantage of Cirrus for some msys testing, but we can likely
> reduce the overlap.
>
> I definitely don't want to see us increasing our use of GitHub, as having
> multiple places to look at for CI results is a really bad thing. We want
> todo what is possible to make GitLab the single dashboard for all CI info.

Agreed a single dashboard is meaningfull, I'll try that. other than that, a
empty
github actions can give better experience with qemu, there is 3.9k for at
github,
and 5.9k star at github

>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
https://www.instagram.com/dberrange :|
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[-- Attachment #2: Type: text/html, Size: 3755 bytes --]

[PATCH v3 3/3] misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

[Yonggang Luo]

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 01d2ce93bd..0e93d02c7e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3615,7 +3615,7 @@ M: Thomas Huth <thuth@redhat.com>
 R: Wainer dos Santos Moschetta <wainersm@redhat.com>
 R: Beraldo Leal <bleal@redhat.com>
 S: Maintained
-F: .github/lockdown.yml
+F: .github/workflows/lockdown.yml
 F: .gitlab-ci.yml
 F: .gitlab-ci.d/
 F: .travis.yml
-- 
2.31.1.windows.1

Re: [PATCH v3 3/3] misc: Fixes MAINTAINERS's path .github/workflows/lockdown.yml

[Philippe Mathieu-Daudé]

On 23/3/22 09:07, Yonggang Luo wrote:
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> ---
>   MAINTAINERS | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 01d2ce93bd..0e93d02c7e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3615,7 +3615,7 @@ M: Thomas Huth <thuth@redhat.com>
>   R: Wainer dos Santos Moschetta <wainersm@redhat.com>
>   R: Beraldo Leal <bleal@redhat.com>
>   S: Maintained
> -F: .github/lockdown.yml
> +F: .github/workflows/lockdown.yml
>   F: .gitlab-ci.yml
>   F: .gitlab-ci.d/
>   F: .travis.yml

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>