[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/28] gitlab-ci: Remove the second superfluous macos task
From: |
Alex Bennée |
Subject: |
[PULL 27/28] gitlab-ci: Remove the second superfluous macos task |
Date: |
Fri, 23 Jul 2021 18:03:53 +0100 |
From: Thomas Huth <thuth@redhat.com>
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.
[AJB: fix up commit formatting which trips up b4]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20210719073051.1559348-1-thuth@redhat.com>
Message-Id: <20210720232703.10650-29-alex.bennee@linaro.org>
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.20.1
- [PULL 26/28] gitlab: enable a very minimal build with the tricore container, (continued)
- [PULL 26/28] gitlab: enable a very minimal build with the tricore container, Alex Bennée, 2021/07/23
- [PULL 21/28] plugins/cache: Fixed a bug with destroying FIFO metadata, Alex Bennée, 2021/07/23
- [PULL 23/28] plugins/cache: Fixed "function decl. is not a prototype" warnings, Alex Bennée, 2021/07/23
- [PULL 15/28] contrib/gitdm: add domain-map for NVIDIA, Alex Bennée, 2021/07/23
- [PULL 13/28] contrib/gitdm: un-ironically add a mapping for LWN, Alex Bennée, 2021/07/23
- [PULL 12/28] contrib/gitdm: add domain-map/group-map for Wind River, Alex Bennée, 2021/07/23
- [PULL 22/28] plugins/cache: limited the scope of a mutex lock, Alex Bennée, 2021/07/23
- [PULL 24/28] plugins: Fix physical address calculation for IO regions, Alex Bennée, 2021/07/23
- [PULL 17/28] contrib/gitdm: add an explicit academic entry for BU, Alex Bennée, 2021/07/23
- [PULL 16/28] contrib/gitdm: add group-map for Netflix, Alex Bennée, 2021/07/23
- [PULL 27/28] gitlab-ci: Remove the second superfluous macos task,
Alex Bennée <=
- [PULL 18/28] contrib/gitdm: add a new interns group-map for GSoC/Outreachy work, Alex Bennée, 2021/07/23
- [PULL 14/28] contrib/gitdm: add domain-map for Crudebyte, Alex Bennée, 2021/07/23
- [PULL 25/28] tests/tcg/configure.sh: add handling for assembler only builds, Alex Bennée, 2021/07/23
- [PULL 28/28] gitlab-ci: Extract OpenSBI job rules to reusable section, Alex Bennée, 2021/07/23
- Re: [PULL for 6.1-rc1 00/28] doc, metadata, plugin and testing updates, Philippe Mathieu-Daudé, 2021/07/23