Skip to contentSkip to conversation

gitlab-ci: Remove the second superfluous macos task

PATCH Applied Thomas Huth 4 participants 4 messages Jul 19, 2021 – Jul 20, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gitlab-ci: Remove the second superfluous macos task

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/[email protected]/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.

---
 .gitlab-ci.d/cirrus.yml | 15 ---------------
 1 file changed, 15 deletions(-)
.gitlab-ci.d/cirrus.yml +0 -15
index 60b13ed83f..675db69622 100644
@@ -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
Signature · 1 line
2.27.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 27 lines · 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/xcode.txt renamed from tmp/base.txt +2 -2
@@ -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/[email protected]/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
Quoted 8 lines

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.

---
 .gitlab-ci.d/cirrus.yml | 15 ---------------
 1 file changed, 15 deletions(-)

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

Regards,
Daniel

Signature · 3 lines
|: 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 :|
Reviewed-by on v1 1/1
#2 lore raw
In reply to Thomas Huth
Quoted 7 lines · 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:

Applied
#3 lore raw
In reply to Thomas Huth
Quoted 5 lines · 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:

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

Signature · 1 line
Alex Bennée