diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml index 67abc4ad1cf53831e130d9b753b15cbc8b932e16..0149f73277185db357465210a089b865a2bced1e 100644 --- a/.oniro-ci/build-generic.yaml +++ b/.oniro-ci/build-generic.yaml @@ -162,6 +162,13 @@ | sed -e 's/^CI_ONIRO_BB_LOCAL_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \ | sort \ | tee -a conf/local.conf ) + - | + ( set +o pipefail; + env \ + | grep -E '^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_[A-Z_0-9]+=' \ + | sed -e 's/^CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_//g' -e 's/"/\\"/g' -e 's/=/ += "/g' -e 's/$/"/g' \ + | sort \ + | tee -a conf/bblayers.conf ) # Sanity check: disallow using public build cache with a specific setting # in local.conf. The list of settings may grow over time. @@ -407,6 +414,12 @@ .build: extends: .build-recipe +.check-abi: + variables: + CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: abicheck + CI_ONIRO_MANIFEST_NAME: manifests/ci.xml + CI_ONIRO_BB_BBLAYERS_CONF_plus_equals_BBLAYERS: "../meta-binaryaudit" + # This job is documented in docs/ci/hidden-jobs/build-docs.rst .build-docs: interruptible: true diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml index 19addc3709d5f7c1de59317e0e9550fa2e67d7a5..56552c9cced4ddb71d690f67a45b6e3395c34221 100644 --- a/.oniro-ci/machines-and-flavours.yaml +++ b/.oniro-ci/machines-and-flavours.yaml @@ -32,7 +32,7 @@ allow_failure: true .linux-qemu-x86: - extends: .build-wic-image + extends: [.build-wic-image, .check-abi] variables: MACHINE: qemux86 CI_ONIRO_BUILD_FLAVOUR: linux diff --git a/manifests/ci.xml b/manifests/ci.xml new file mode 100644 index 0000000000000000000000000000000000000000..5768d945d59ba8dd7da732f9342dbf592dc82b63 --- /dev/null +++ b/manifests/ci.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +SPDX-License-Identifier: Apache-2.0 +SPDX-FileCopyrightText: Huawei Inc. +--> +<manifest> + <include name="manifests/default.xml" /> + <project name="oniro-core/meta-binaryaudit" remote="eclipse" revision="oniro/kirkstone" path="meta-binaryaudit" /> +</manifest> +