diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile index a0d75453..079eb058 100644 --- a/.cci.jenkinsfile +++ b/.cci.jenkinsfile @@ -7,6 +7,7 @@ parallel rpms: { shwrap(""" # fetch tags so `git describe` gives a nice NEVRA when building the RPM git fetch origin --tags + ci/install-extra-builddeps.sh ci/installdeps.sh git submodule update --init diff --git a/ci/build.sh b/ci/build.sh index 2cbcbee7..db083e84 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -6,6 +6,7 @@ set -xeuo pipefail dn=$(dirname $0) . ${dn}/libbuild.sh +${dn}/install-extra-builddeps.sh ${dn}/installdeps.sh # create an unprivileged user for testing diff --git a/ci/install-extra-builddeps.sh b/ci/install-extra-builddeps.sh new file mode 100755 index 00000000..b5a216e7 --- /dev/null +++ b/ci/install-extra-builddeps.sh @@ -0,0 +1,6 @@ +#!/usr/bin/bash +# Install build dependencies not in the cosa buildroot already +set -xeuo pipefail +if ! command -v cxxbridge; then + cargo install --root=/usr cxxbridge-cmd +fi