diff --git a/.oniro-ci/build-generic.yaml b/.oniro-ci/build-generic.yaml index 8dbb59aca711ca044f870c4e4c6653dd96398614..f7ecbfc0d46b2693179d6e5c6d50b2e5c11a11ec 100644 --- a/.oniro-ci/build-generic.yaml +++ b/.oniro-ci/build-generic.yaml @@ -87,7 +87,7 @@ CI_ONIRO_BB_LOCAL_CONF_SSTATE_DIR: $CI_ONIRO_RUNNER_PERSISTENT_STORAGE/$CI_ONIRO_BUILD_CACHE/bitbake/sstate-cache CI_ONIRO_BB_LOCAL_CONF_IMAGE_VERSION_SUFFIX: "" CI_ONIRO_BB_LOCAL_CONF_CVE_CHECK_DB_DIR: "$${TMPDIR}/CVE_CHECK/" - CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check + CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: cve-check abicheck CI_ONIRO_BB_LOCAL_CONF_plus_equals_USER_CLASSES: "buildstats buildstats-summary" CI_ONIRO_DEVTOOL_RECIPE_NAME: "" CI_ONIRO_DEVTOOL_LAYER_PATH: "" @@ -413,6 +413,14 @@ .build: extends: .build-recipe +.check-abi: + variables: + CI_ONIRO_BB_LOCAL_CONF_plus_equals_INHERIT: abicheck + CI_ONIRO_MANIFEST_NAME: manifests/ci.xml + script: + - !reference [.bitbake-workspace, script] + - bitbake-layers add-layer ../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 c7c078d2ca93b8ba37e9ab0e91d6a2d8e2651713..b2bb6dbe0c057d9154c22aacc5557cd1291fbd67 100644 --- a/.oniro-ci/machines-and-flavours.yaml +++ b/.oniro-ci/machines-and-flavours.yaml @@ -7,7 +7,7 @@ # The following jobs are documented in docs/ci/machines-and-flavours.rst 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..83b4c6cb60953eab04cf4c44f8a911c2abe33a60 --- /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="kirkstone" path="meta-binaryaudit" /> +</manifest> + diff --git a/manifests/default.xml b/manifests/default.xml index 36be8fe233625316495820233b7180b7274a1870..ba4ccbe985cf32ebdf7ca8a08533f16f9db3a1df 100644 --- a/manifests/default.xml +++ b/manifests/default.xml @@ -54,6 +54,5 @@ SPDX-FileCopyrightText: Huawei Inc. <project name="oniro-core/meta-clang.git" remote="eclipse" revision="oniro/kirkstone" path="meta-clang" /> <project name="oniro-core/meta-zephyr.git" remote="eclipse" revision="oniro/kirkstone" path="meta-zephyr" /> <project name="oniro-core/docs.git" remote="eclipse" revision="main" path="docs" /> - <project name="oniro-core/meta-binaryaudit" remote="eclipse" revision="kirkstone" path="meta-binaryaudit" /> <project name="distro/governance/ip-policy" remote="oniro-booting" revision="main" path="ip-policy" /> </manifest>