ci: Introduce install-extra-builddeps.sh

We need to cleanly split off "test dependencies" that we
install inside the cosa pod from builds (where we won't
have `cargo`) from the build time where we use the cosa
buildroot image.

Prep for using https://cxx.rs
This commit is contained in:
Colin Walters 2020-12-11 20:39:04 +00:00 committed by OpenShift Merge Robot
parent 9b13ce3906
commit 9f19ed2ac8
3 changed files with 8 additions and 0 deletions

View File

@ -7,6 +7,7 @@ parallel rpms: {
shwrap(""" shwrap("""
# fetch tags so `git describe` gives a nice NEVRA when building the RPM # fetch tags so `git describe` gives a nice NEVRA when building the RPM
git fetch origin --tags git fetch origin --tags
ci/install-extra-builddeps.sh
ci/installdeps.sh ci/installdeps.sh
git submodule update --init git submodule update --init

View File

@ -6,6 +6,7 @@ set -xeuo pipefail
dn=$(dirname $0) dn=$(dirname $0)
. ${dn}/libbuild.sh . ${dn}/libbuild.sh
${dn}/install-extra-builddeps.sh
${dn}/installdeps.sh ${dn}/installdeps.sh
# create an unprivileged user for testing # create an unprivileged user for testing

6
ci/install-extra-builddeps.sh Executable file
View File

@ -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