[PATCH] gitlab-ci: Remove the second superfluous macos task

[PATCH] gitlab-ci: Remove the second superfluous macos task

[Thomas Huth]

While there might have been bigger differnces between the -base and
the -xcode images in the beginning, they almost vanished in the
current builds, e.g. when comparing the output of the "configure"
step after cleaning up the differences due to temporary path names,
I only get:

$ diff -u /tmp/base.txt /tmp/xcode.txt
--- /tmp/base.txt	2021-07-16 09:16:24.211427940 +0200
+++ /tmp/xcode.txt	2021-07-16 09:16:43.029684274 +0200
@@ -19,14 +19,14 @@
 Build type: native build
 Project name: qemu
 Project version: 6.0.50
-C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.29)")
+C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.28)")
 C linker for the host machine: cc ld64 609.8
 Host machine cpu family: x86_64
 Host machine cpu: x86_64
 Program sh found: YES (/bin/sh)
 Program python3 found: YES (/usr/local/opt/python@3.9/bin/python3.9)
 Program bzip2 found: YES (/usr/bin/bzip2)
-C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.29)")
+C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.28)")
 C++ linker for the host machine: c++ ld64 609.8
 Objective-C compiler for the host machine: clang (clang 12.0.0)
 Objective-C linker for the host machine: clang ld64 609.8

Since we're not using Xcode itself at all, it seems like it does not
make much sense anymore to waste compute cycles with two images here.
Thus let's delete the -xcode job now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/cirrus.yml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/.gitlab-ci.d/cirrus.yml b/.gitlab-ci.d/cirrus.yml
index 60b13ed83f..675db69622 100644
--- a/.gitlab-ci.d/cirrus.yml
+++ b/.gitlab-ci.d/cirrus.yml
@@ -85,18 +85,3 @@ x64-macos-11-base-build:
     PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin
     PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
     TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
-
-x64-macos-11-xcode-build:
-  extends: .cirrus_build_job
-  variables:
-    NAME: macos-11
-    CIRRUS_VM_INSTANCE_TYPE: osx_instance
-    CIRRUS_VM_IMAGE_SELECTOR: image
-    CIRRUS_VM_IMAGE_NAME: big-sur-xcode
-    CIRRUS_VM_CPUS: 12
-    CIRRUS_VM_RAM: 24G
-    UPDATE_COMMAND: brew update
-    INSTALL_COMMAND: brew install
-    PATH_EXTRA: /usr/local/opt/ccache/libexec:/usr/local/opt/gettext/bin
-    PKG_CONFIG_PATH: /usr/local/opt/curl/lib/pkgconfig:/usr/local/opt/ncurses/lib/pkgconfig:/usr/local/opt/readline/lib/pkgconfig
-    TEST_TARGETS: check-unit check-block check-qapi-schema check-softfloat check-qtest-x86_64
-- 
2.27.0

Re: [PATCH] gitlab-ci: Remove the second superfluous macos task

[Daniel P. Berrangé]

On Mon, Jul 19, 2021 at 09:30:51AM +0200, Thomas Huth wrote:
> While there might have been bigger differnces between the -base and
> the -xcode images in the beginning, they almost vanished in the
> current builds, e.g. when comparing the output of the "configure"
> step after cleaning up the differences due to temporary path names,
> I only get:
> 
> $ diff -u /tmp/base.txt /tmp/xcode.txt
> --- /tmp/base.txt	2021-07-16 09:16:24.211427940 +0200
> +++ /tmp/xcode.txt	2021-07-16 09:16:43.029684274 +0200
> @@ -19,14 +19,14 @@
>  Build type: native build
>  Project name: qemu
>  Project version: 6.0.50
> -C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.29)")
> +C compiler for the host machine: cc (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.28)")
>  C linker for the host machine: cc ld64 609.8
>  Host machine cpu family: x86_64
>  Host machine cpu: x86_64
>  Program sh found: YES (/bin/sh)
>  Program python3 found: YES (/usr/local/opt/python@3.9/bin/python3.9)
>  Program bzip2 found: YES (/usr/bin/bzip2)
> -C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.29)")
> +C++ compiler for the host machine: c++ (clang 12.0.0 "Apple clang version 12.0.0 (clang-1200.0.32.28)")
>  C++ linker for the host machine: c++ ld64 609.8
>  Objective-C compiler for the host machine: clang (clang 12.0.0)
>  Objective-C linker for the host machine: clang ld64 609.8
> 
> Since we're not using Xcode itself at all, it seems like it does not
> make much sense anymore to waste compute cycles with two images here.
> Thus let's delete the -xcode job now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  .gitlab-ci.d/cirrus.yml | 15 ---------------
>  1 file changed, 15 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


We can always add it back easily later if it becomes relevant again in
a future release/update.


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] gitlab-ci: Remove the second superfluous macos task

[Willian Rampazzo]

On Mon, Jul 19, 2021 at 4:31 AM Thomas Huth <thuth@redhat.com> wrote:
>
> While there might have been bigger differnces between the -base and
> the -xcode images in the beginning, they almost vanished in the
> current builds, e.g. when comparing the output of the "configure"
> step after cleaning up the differences due to temporary path names,
> I only get:
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Re: [PATCH] gitlab-ci: Remove the second superfluous macos task

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> While there might have been bigger differnces between the -base and
> the -xcode images in the beginning, they almost vanished in the
> current builds, e.g. when comparing the output of the "configure"
> step after cleaning up the differences due to temporary path names,
> I only get:

Queued to for-6.1/fixes-for-rc1, thanks.

-- 
Alex Bennée