[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS |
Date: |
Wed, 26 May 2021 23:18:21 +0200 |
From: Richard Henderson <richard.henderson@linaro.org>
Suggested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210502235727.1979457-26-richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
.gitlab-ci.d/crossbuilds.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml
index e44e4b49a25..2198abb400e 100644
--- a/.gitlab-ci.d/crossbuilds.yml
+++ b/.gitlab-ci.d/crossbuilds.yml
@@ -16,7 +16,7 @@
#
# Set the $ACCEL variable to select the specific accelerator (default to
# KVM), and set extra options (such disabling other accelerators) via the
-# $ACCEL_CONFIGURE_OPTS variable.
+# $EXTRA_CONFIGURE_OPTS variable.
.cross_accel_build_job:
stage: build
image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
@@ -26,7 +26,7 @@
- cd build
- PKG_CONFIG_PATH=$PKG_CONFIG_PATH
../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS
- --disable-tools --enable-${ACCEL:-kvm} $ACCEL_CONFIGURE_OPTS
+ --disable-tools --enable-${ACCEL:-kvm} $EXTRA_CONFIGURE_OPTS
- make -j$(expr $(nproc) + 1) all check-build
.cross_user_build_job:
@@ -174,7 +174,7 @@ cross-s390x-kvm-only:
job: s390x-debian-cross-container
variables:
IMAGE: debian-s390x-cross
- ACCEL_CONFIGURE_OPTS: --disable-tcg
+ EXTRA_CONFIGURE_OPTS: --disable-tcg
cross-mips64el-kvm-only:
extends: .cross_accel_build_job
@@ -182,7 +182,7 @@ cross-mips64el-kvm-only:
job: mips64el-debian-cross-container
variables:
IMAGE: debian-mips64el-cross
- ACCEL_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
+ EXTRA_CONFIGURE_OPTS: --disable-tcg --target-list=mips64el-softmmu
cross-win32-system:
extends: .cross_system_build_job
@@ -205,7 +205,7 @@ cross-amd64-xen-only:
variables:
IMAGE: debian-amd64-cross
ACCEL: xen
- ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
+ EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
cross-arm64-xen-only:
extends: .cross_accel_build_job
@@ -214,4 +214,4 @@ cross-arm64-xen-only:
variables:
IMAGE: debian-arm64-cross
ACCEL: xen
- ACCEL_CONFIGURE_OPTS: --disable-tcg --disable-kvm
+ EXTRA_CONFIGURE_OPTS: --disable-tcg --disable-kvm
--
2.26.3
- [PULL 00/19] gitlab-ci patches for 2021-05-26, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 01/19] gitlab: Replace YAML anchors by extends (acceptance_test_job), Philippe Mathieu-Daudé, 2021/05/26
- [PULL 02/19] gitlab: Rename ACCEL_CONFIGURE_OPTS to EXTRA_CONFIGURE_OPTS,
Philippe Mathieu-Daudé <=
- [PULL 03/19] gitlab: Enable cross-i386 builds of TCI, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 04/19] gitlab: Extract container job template to container-template.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 05/19] gitlab: Extract crossbuild job templates to crossbuild-template.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 06/19] gitlab: Extract DCO/style check jobs to static_checks.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 07/19] gitlab: Extract build stages to stages.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 08/19] gitlab: Extract default build/test jobs templates, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 09/19] gitlab: Extract core container jobs to container-core.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 10/19] gitlab: Drop linux user build job for CentOS 7, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 11/19] gitlab: Extract all default build/test jobs to buildtest.yml, Philippe Mathieu-Daudé, 2021/05/26
- [PULL 12/19] gitlab: Move current job set to qemu-project.yml, Philippe Mathieu-Daudé, 2021/05/26